Skip to content

Commit 0c8700b

Browse files
borsbors
committed
Auto merge of #59298 - kennytm:rollup, r=kennytm
Rollup of 5 pull requests (all of which changes `src/ci/docker`) Successful merges: - #58986 ([CI] Update binutils for powerpc64 and powerpc64le) - #59038 (Track embedded-book in the toolstate) - #59055 (CI: Set job names.) - #59253 (Calculate Docker cache hash precisely from Dockerfile's dependencies) - #59257 (Update CI configuration for building Redox libraries) Failed merges: r? @ghost
2 parents 3eb4890 + f31974a commit 0c8700b

File tree

9 files changed

+122
-49
lines changed

9 files changed

+122
-49
lines changed

‎.travis.yml‎

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,27 @@ git:
1212
depth: 2
1313
submodules: false
1414

15+
env:
16+
global:
17+
- CI_JOB_NAME=$TRAVIS_JOB_NAME
18+
1519
matrix:
1620
fast_finish: true
1721
include:
1822
# Images used in testing PR and try-build should be run first.
1923
- env: IMAGE=x86_64-gnu-llvm-6.0 RUST_BACKTRACE=1
24+
name: x86_64-gnu-llvm-6.0
2025
if: type = pull_request OR branch = auto
2126

2227
- env: IMAGE=dist-x86_64-linux DEPLOY=1
28+
name: dist-x86_64-linux
2329
if: branch = try OR branch = auto
2430

2531
# "alternate" deployments, these are "nightlies" but have LLVM assertions
2632
# turned on, they're deployed to a different location primarily for
2733
# additional testing.
28-
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt
34+
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
35+
name: dist-x86_64-linux-alt
2936
if: branch = try OR branch = auto
3037

3138
- env: >
@@ -37,9 +44,9 @@ matrix:
3744
MACOSX_DEPLOYMENT_TARGET=10.7
3845
NO_LLVM_ASSERTIONS=1
3946
NO_DEBUG_ASSERTIONS=1
40-
CI_JOB_NAME=dist-x86_64-apple-alt
4147
os: osx
4248
osx_image: xcode9.3-moar
49+
name: dist-x86_64-apple-alt
4350
if: branch = auto
4451
4552
# macOS builders. These are placed near the beginning because they are very
@@ -60,9 +67,9 @@ matrix:
6067
MACOSX_STD_DEPLOYMENT_TARGET=10.7
6168
NO_LLVM_ASSERTIONS=1
6269
NO_DEBUG_ASSERTIONS=1
63-
CI_JOB_NAME=x86_64-apple
6470
os: osx
6571
osx_image: xcode9.3-moar
72+
name: x86_64-apple
6673
if: branch = auto
6774
6875
- env: >
@@ -74,9 +81,9 @@ matrix:
7481
MACOSX_STD_DEPLOYMENT_TARGET=10.7
7582
NO_LLVM_ASSERTIONS=1
7683
NO_DEBUG_ASSERTIONS=1
77-
CI_JOB_NAME=i686-apple
7884
os: osx
7985
osx_image: xcode9.3-moar
86+
name: i686-apple
8087
if: branch = auto
8188
8289
# OSX builders producing releases. These do not run the full test suite and
@@ -95,9 +102,9 @@ matrix:
95102
NO_LLVM_ASSERTIONS=1
96103
NO_DEBUG_ASSERTIONS=1
97104
DIST_REQUIRE_ALL_TOOLS=1
98-
CI_JOB_NAME=dist-i686-apple
99105
os: osx
100106
osx_image: xcode9.3-moar
107+
name: dist-i686-apple
101108
if: branch = auto
102109
103110
- env: >
@@ -110,81 +117,116 @@ matrix:
110117
NO_LLVM_ASSERTIONS=1
111118
NO_DEBUG_ASSERTIONS=1
112119
DIST_REQUIRE_ALL_TOOLS=1
113-
CI_JOB_NAME=dist-x86_64-apple
114120
os: osx
115121
osx_image: xcode9.3-moar
122+
name: dist-x86_64-apple
116123
if: branch = auto
117124
118125
# Linux builders, remaining docker images
119126
- env: IMAGE=arm-android
127+
name: arm-android
120128
if: branch = auto
121129
- env: IMAGE=armhf-gnu
130+
name: armhf-gnu
122131
if: branch = auto
123132
- env: IMAGE=dist-various-1 DEPLOY=1
133+
name: dist-various-1
124134
if: branch = auto
125135
- env: IMAGE=dist-various-2 DEPLOY=1
136+
name: dist-various-2
126137
if: branch = auto
127138
- env: IMAGE=dist-aarch64-linux DEPLOY=1
139+
name: dist-aarch64-linux
128140
if: branch = auto
129141
- env: IMAGE=dist-android DEPLOY=1
142+
name: dist-android
130143
if: branch = auto
131144
- env: IMAGE=dist-arm-linux DEPLOY=1
145+
name: dist-arm-linux
132146
if: branch = auto
133147
- env: IMAGE=dist-armhf-linux DEPLOY=1
148+
name: dist-armhf-linux
134149
if: branch = auto
135150
- env: IMAGE=dist-armv7-linux DEPLOY=1
151+
name: dist-armv7-linux
136152
if: branch = auto
137153
- env: IMAGE=dist-i586-gnu-i586-i686-musl DEPLOY=1
154+
name: dist-i586-gnu-i586-i686-musl
138155
if: branch = auto
139156
- env: IMAGE=dist-i686-freebsd DEPLOY=1
157+
name: dist-i686-freebsd
140158
if: branch = auto
141159
- env: IMAGE=dist-i686-linux DEPLOY=1
160+
name: dist-i686-linux
142161
if: branch = auto
143162
- env: IMAGE=dist-mips-linux DEPLOY=1
163+
name: dist-mips-linux
144164
if: branch = auto
145165
- env: IMAGE=dist-mips64-linux DEPLOY=1
166+
name: dist-mips64-linux
146167
if: branch = auto
147168
- env: IMAGE=dist-mips64el-linux DEPLOY=1
169+
name: dist-mips64el-linux
148170
if: branch = auto
149171
- env: IMAGE=dist-mipsel-linux DEPLOY=1
172+
name: dist-mipsel-linux
150173
if: branch = auto
151174
- env: IMAGE=dist-powerpc-linux DEPLOY=1
175+
name: dist-powerpc-linux
152176
if: branch = auto
153177
- env: IMAGE=dist-powerpc64-linux DEPLOY=1
178+
name: dist-powerpc64-linux
154179
if: branch = auto
155180
- env: IMAGE=dist-powerpc64le-linux DEPLOY=1
181+
name: dist-powerpc64le-linux
156182
if: branch = auto
157183
- env: IMAGE=dist-s390x-linux DEPLOY=1
184+
name: dist-s390x-linux
158185
if: branch = auto
159186
- env: IMAGE=dist-x86_64-freebsd DEPLOY=1
187+
name: dist-x86_64-freebsd
160188
if: branch = auto
161189
- env: IMAGE=dist-x86_64-musl DEPLOY=1
190+
name: dist-x86_64-musl
162191
if: branch = auto
163192
- env: IMAGE=dist-x86_64-netbsd DEPLOY=1
193+
name: dist-x86_64-netbsd
164194
if: branch = auto
165195
- env: IMAGE=asmjs
196+
name: asmjs
166197
if: branch = auto
167198
- env: IMAGE=i686-gnu
199+
name: i686-gnu
168200
if: branch = auto
169201
- env: IMAGE=i686-gnu-nopt
202+
name: i686-gnu-nopt
170203
if: branch = auto
171204
- env: IMAGE=test-various
205+
name: test-various
172206
if: branch = auto
173207
- env: IMAGE=x86_64-gnu
208+
name: x86_64-gnu
174209
if: branch = auto
175210
- env: IMAGE=x86_64-gnu-full-bootstrap
211+
name: x86_64-gnu-full-bootstrap
176212
if: branch = auto
177213
- env: IMAGE=x86_64-gnu-aux
214+
name: x86_64-gnu-aux
178215
if: branch = auto
179216
- env: IMAGE=x86_64-gnu-tools
217+
name: x86_64-gnu-tools
180218
if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
181219
- env: IMAGE=x86_64-gnu-debug
220+
name: x86_64-gnu-debug
182221
if: branch = auto
183222
- env: IMAGE=x86_64-gnu-nopt
223+
name: x86_64-gnu-nopt
184224
if: branch = auto
185225
- env: IMAGE=x86_64-gnu-distcheck
226+
name: x86_64-gnu-distcheck
186227
if: branch = auto
187228
- env: IMAGE=mingw-check
229+
name: mingw-check
188230
if: type = pull_request OR branch = auto
189231

190232
- stage: publish toolstate

‎appveyor.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ environment:
1010

1111
matrix:
1212
# 32/64 bit MSVC tests
13-
- MSYS_BITS: 64
13+
- CI_JOB_NAME: x86_64-msvc
14+
MSYS_BITS: 64
1415
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
1516
SCRIPT: python x.py test
16-
CI_JOB_NAME: x86_64-msvc
17-
- MSYS_BITS: 32
17+
- CI_JOB_NAME: i686-msvc-1
18+
MSYS_BITS: 32
1819
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
1920
SCRIPT: make appveyor-subset-1
20-
CI_JOB_NAME: i686-msvc-1
21-
- MSYS_BITS: 32
21+
- CI_JOB_NAME: i686-msvc-2
22+
MSYS_BITS: 32
2223
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
2324
SCRIPT: make appveyor-subset-2
24-
CI_JOB_NAME: i686-msvc-2
2525

2626
# MSVC aux tests
27-
- MSYS_BITS: 64
27+
- CI_JOB_NAME: x86_64-msvc-aux
28+
MSYS_BITS: 64
2829
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
2930
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
30-
CI_JOB_NAME: x86_64-msvc-aux
31-
- MSYS_BITS: 64
31+
- CI_JOB_NAME: x86_64-msvc-cargo
32+
MSYS_BITS: 64
3233
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
3334
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
34-
CI_JOB_NAME: x86_64-msvc-cargo
3535

3636
# MSVC tools tests
37-
- MSYS_BITS: 64
37+
- CI_JOB_NAME: x86_64-msvc-tools
38+
MSYS_BITS: 64
3839
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
3940
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
40-
CI_JOB_NAME: x86_64-msvc-tools
4141

4242
# 32/64-bit MinGW builds.
4343
#
@@ -52,72 +52,72 @@ environment:
5252
# bucket, but they cleraly didn't originate there! The downloads originally
5353
# came from the mingw-w64 SourceForge download site. Unfortunately
5454
# SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
55-
- MSYS_BITS: 32
55+
- CI_JOB_NAME: i686-mingw-1
56+
MSYS_BITS: 32
5657
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
5758
SCRIPT: make appveyor-subset-1
5859
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
5960
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6061
MINGW_DIR: mingw32
61-
CI_JOB_NAME: i686-mingw-1
62-
- MSYS_BITS: 32
62+
- CI_JOB_NAME: i686-mingw-2
63+
MSYS_BITS: 32
6364
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
6465
SCRIPT: make appveyor-subset-2
6566
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
6667
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6768
MINGW_DIR: mingw32
68-
CI_JOB_NAME: i686-mingw-2
69-
- MSYS_BITS: 64
69+
- CI_JOB_NAME: x86_64-mingw
70+
MSYS_BITS: 64
7071
SCRIPT: python x.py test
7172
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
7273
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
7374
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
7475
MINGW_DIR: mingw64
75-
CI_JOB_NAME: x86_64-mingw
7676

7777
# 32/64 bit MSVC and GNU deployment
78-
- RUST_CONFIGURE_ARGS: >
78+
- CI_JOB_NAME: dist-x86_64-msvc
79+
RUST_CONFIGURE_ARGS: >
7980
--build=x86_64-pc-windows-msvc
8081
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
8182
--enable-full-tools
8283
--enable-profiler
8384
SCRIPT: python x.py dist
8485
DIST_REQUIRE_ALL_TOOLS: 1
8586
DEPLOY: 1
86-
CI_JOB_NAME: dist-x86_64-msvc
87-
- RUST_CONFIGURE_ARGS: >
87+
- CI_JOB_NAME: dist-i686-msvc
88+
RUST_CONFIGURE_ARGS: >
8889
--build=i686-pc-windows-msvc
8990
--target=i586-pc-windows-msvc
9091
--enable-full-tools
9192
--enable-profiler
9293
SCRIPT: python x.py dist
9394
DIST_REQUIRE_ALL_TOOLS: 1
9495
DEPLOY: 1
95-
CI_JOB_NAME: dist-i686-msvc
96-
- MSYS_BITS: 32
96+
- CI_JOB_NAME: dist-i686-mingw
97+
MSYS_BITS: 32
9798
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
9899
SCRIPT: python x.py dist
99100
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
100101
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
101102
MINGW_DIR: mingw32
102103
DIST_REQUIRE_ALL_TOOLS: 1
103104
DEPLOY: 1
104-
CI_JOB_NAME: dist-i686-mingw
105-
- MSYS_BITS: 64
105+
- CI_JOB_NAME: dist-x86_64-mingw
106+
MSYS_BITS: 64
106107
SCRIPT: python x.py dist
107108
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
108109
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
109110
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
110111
MINGW_DIR: mingw64
111112
DIST_REQUIRE_ALL_TOOLS: 1
112113
DEPLOY: 1
113-
CI_JOB_NAME: dist-x86_64-mingw
114114

115115
# "alternate" deployment, see .travis.yml for more info
116-
- MSYS_BITS: 64
116+
- CI_JOB_NAME: dist-x86_64-msvc-alt
117+
MSYS_BITS: 64
117118
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
118119
SCRIPT: python x.py dist
119120
DEPLOY_ALT: 1
120-
CI_JOB_NAME: dist-x86_64-msvc-alt
121121

122122
matrix:
123123
fast_finish: true

‎src/ci/docker/disabled/dist-x86_64-redox/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ COPY scripts/crosstool-ng.sh /scripts/
77
RUN sh /scripts/crosstool-ng.sh
88

99
WORKDIR /tmp
10-
COPY cross/install-x86_64-redox.sh /tmp/
11-
RUN ./install-x86_64-redox.sh
10+
COPY dist-various-1/install-x86_64-redox.sh /scripts/
11+
RUN sh /scripts/install-x86_64-redox.sh
1212

1313
COPY scripts/sccache.sh /scripts/
1414
RUN sh /scripts/sccache.sh

‎src/ci/docker/dist-powerpc64-linux/build-powerpc64-toolchain.sh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,29 @@ set -ex
33

44
source shared.sh
55

6+
BINUTILS=2.32
7+
TARGET=powerpc64-unknown-linux-gnu
8+
PREFIX=/x-tools/$TARGET
9+
SYSROOT=$PREFIX/$TARGET/sysroot
10+
611
mkdir build
712
cd build
813
cp ../powerpc64-linux-gnu.config .config
914
hide_output ct-ng build
1015
cd ..
1116
rm -rf build
17+
18+
chmod -R u+w $PREFIX
19+
20+
# Next, download and build newer binutils.
21+
mkdir binutils-$TARGET
22+
pushd binutils-$TARGET
23+
curl https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS.tar.bz2 | tar xjf -
24+
mkdir binutils-build
25+
cd binutils-build
26+
hide_output ../binutils-$BINUTILS/configure --target=$TARGET \
27+
--prefix=$PREFIX --with-sysroot=$SYSROOT
28+
hide_output make -j10
29+
hide_output make install
30+
popd
31+
rm -rf binutils-$TARGET

‎src/ci/docker/dist-powerpc64le-linux/build-powerpc64le-toolchain.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44

55
source shared.sh
66

7-
BINUTILS=2.25.1
7+
BINUTILS=2.32
88
GCC=5.3.0
99
TARGET=powerpc64le-linux-gnu
1010
SYSROOT=/usr/local/$TARGET/sysroot

‎src/ci/docker/dist-various-1/install-x86_64-redox.sh‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@
33

44
set -ex
55

6-
apt-get update
7-
apt-get install -y --no-install-recommends software-properties-common apt-transport-https
8-
9-
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA12E97F0881517F
10-
add-apt-repository -y 'deb https://static.redox-os.org/toolchain/apt /'
11-
12-
apt-get update
13-
apt-get install -y x86-64-unknown-redox-gcc
6+
curl https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz | \
7+
tar --extract --gzip --directory /usr/local

0 commit comments

Comments
 (0)