Skip to content

Commit bf4082a

Browse files
committed
Install p7zip on DEPLOY=1 docker images and on MacOSX/Travis
On Ubuntu `7z` is available in the `p7zip-full` package. On MacOSX it is in the `p7zip` formula. On AppVeyor it is installed by default. The `dist-*` and `cross` docker images build and deploy the dist artifacts; the `x86_64-gnu-distcheck` docker image builds and checks their sanity.
1 parent c439ec0 commit bf4082a

File tree

22 files changed

+30
-3
lines changed

22 files changed

+30
-3
lines changed

.travis.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ matrix:
9595
MACOSX_DEPLOYMENT_TARGET=10.7
9696
os: osx
9797
osx_image: xcode7
98-
install: *osx_install_sccache
98+
install:
99+
- brew install p7zip
100+
- *osx_install_sccache
99101
- env: >
100102
RUST_CHECK_TARGET=dist
101103
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
@@ -106,7 +108,9 @@ matrix:
106108
MACOSX_DEPLOYMENT_TARGET=10.7
107109
os: osx
108110
osx_image: xcode7
109-
install: *osx_install_sccache
111+
install:
112+
- brew install p7zip
113+
- *osx_install_sccache
110114
111115
# "alternate" deployments, these are "nightlies" but don't have assertions
112116
# turned on, they're deployed to a different location primarily for projects
@@ -123,7 +127,9 @@ matrix:
123127
MACOSX_DEPLOYMENT_TARGET=10.7
124128
os: osx
125129
osx_image: xcode7
126-
install: *osx_install_sccache
130+
install:
131+
- brew install p7zip
132+
- *osx_install_sccache
127133
128134
env:
129135
global:

src/ci/docker/cross/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
git \
1111
cmake \
1212
sudo \
13+
p7zip-full \
1314
xz-utils \
1415
zlib1g-dev \
1516
g++-arm-linux-gnueabi \

src/ci/docker/dist-aarch64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-android/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN dpkg --add-architecture i386 && \
1616
openjdk-9-jre \
1717
sudo \
1818
libstdc++6:i386 \
19+
p7zip-full \
1920
xz-utils \
2021
libssl-dev \
2122
pkg-config

src/ci/docker/dist-arm-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-armhf-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-armv7-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-fuchsia/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
git \
1212
sudo \
1313
bzip2 \
14+
p7zip-full \
1415
xz-utils \
1516
swig \
1617
libedit-dev \

src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12+
p7zip-full \
1213
xz-utils \
1314
sudo \
1415
gdb \

src/ci/docker/dist-i686-freebsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
bzip2 \
14+
p7zip-full \
1415
xz-utils \
1516
wget \
1617
libssl-dev \

src/ci/docker/dist-mips-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
p7zip-full \
1415
xz-utils \
1516
g++-mips-linux-gnu \
1617
libssl-dev \

src/ci/docker/dist-mips64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
p7zip-full \
1415
xz-utils \
1516
g++-mips64-linux-gnuabi64 \
1617
libssl-dev \

src/ci/docker/dist-mips64el-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
p7zip-full \
1415
xz-utils \
1516
g++-mips64el-linux-gnuabi64 \
1617
libssl-dev \

src/ci/docker/dist-mipsel-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
p7zip-full \
1415
xz-utils \
1516
g++-mipsel-linux-gnu \
1617
libssl-dev \

src/ci/docker/dist-powerpc-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-powerpc64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-powerpc64le-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-s390x-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/dist-x86_64-freebsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
bzip2 \
14+
p7zip-full \
1415
xz-utils \
1516
wget \
1617
libssl-dev \

src/ci/docker/dist-x86_64-musl/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
python2.7 \
1010
git \
1111
cmake \
12+
p7zip-full \
1213
xz-utils \
1314
sudo \
1415
gdb \

src/ci/docker/dist-x86_64-netbsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2323
sudo \
2424
texinfo \
2525
wget \
26+
p7zip-full \
2627
xz-utils \
2728
libssl-dev \
2829
pkg-config

src/ci/docker/x86_64-gnu-distcheck/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
p7zip-full \
1415
xz-utils \
1516
libssl-dev \
1617
pkg-config

0 commit comments

Comments
 (0)