nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis: ubuntu: remove libxcb-xrm-dev from Build-Deps 

It’s installed separately.

This should fix the failing travis build.
This commit is contained in:
Michael Stapelberg 2016-05-24 20:07:01 +02:00
parent 9409c2b2e5
commit 8dbdcde9a6
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
travis/travis-base-ubuntu-386.Dockerfile
View File

@ -25,6 +25,7 @@ RUN linux32 apt-get update && \
# Install i3 build dependencies. # Install i3 build dependencies.
COPY debian/control /usr/src/i3-debian-packaging/control COPY debian/control /usr/src/i3-debian-packaging/control
RUN linux32 apt-get update && \ RUN linux32 apt-get update && \
sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

1
travis/travis-base-ubuntu.Dockerfile
View File

@ -26,6 +26,7 @@ RUN apt-get update && \
# Install i3 build dependencies. # Install i3 build dependencies.
COPY debian/control /usr/src/i3-debian-packaging/control COPY debian/control /usr/src/i3-debian-packaging/control
RUN apt-get update && \ RUN apt-get update && \
sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*