13
13
arch : [arm, arm64, ppc64le, riscv64, x86_64]
14
14
toolchain : [gcc, clang, llvm]
15
15
config : [debug, release]
16
- rustc : [2021-05-29 ]
16
+ rustc : [2021-06-23 ]
17
17
output : [src] # [src, build]
18
18
install : [rustup] # [rustup, standalone]
19
19
sysroot : [common] # [common, custom]
@@ -30,30 +30,30 @@ jobs:
30
30
31
31
# A few independent combinations to avoid exploding the matrix:
32
32
# - The other option for `output`.
33
- # - Different nightlies for `rustc`.
33
+ # - Different releases for `rustc`.
34
34
# - The other three (`install`, `sysroot`) combinations
35
35
# (they are interrelated, so the cross-product needs to be tested)
36
36
include :
37
37
- arch : arm64
38
38
toolchain : gcc
39
39
config : debug
40
- rustc : 2021-05-29
40
+ rustc : 2021-06-23
41
41
output : build
42
42
install : rustup
43
43
sysroot : custom
44
44
45
45
- arch : ppc64le
46
46
toolchain : clang
47
47
config : release
48
- rustc : 2021-05-29
48
+ rustc : 2021-06-23
49
49
output : build
50
50
install : standalone
51
51
sysroot : common
52
52
53
53
- arch : x86_64
54
54
toolchain : llvm
55
55
config : debug
56
- rustc : 2021-05-29
56
+ rustc : 2021-06-23
57
57
output : build
58
58
install : standalone
59
59
sysroot : custom
@@ -178,12 +178,14 @@ jobs:
178
178
# Setup: rustc
179
179
- if : matrix.install == 'rustup'
180
180
run : |
181
- rustup default nightly -${{ matrix.rustc }}
181
+ rustup default beta -${{ matrix.rustc }}
182
182
rustup component add rustfmt
183
183
- if : matrix.install == 'standalone'
184
184
run : |
185
- curl https://static.rust-lang.org/dist/${{ matrix.rustc }}/rust-nightly-x86_64-unknown-linux-gnu.tar.gz | tar xz
186
- rust-nightly-x86_64-unknown-linux-gnu/install.sh --without=rust-docs --prefix=$HOME/rustc
185
+ # FIXME: there is no beta equivalent for https://static.rust-lang.org/dist/channel-rust-x.yy.z.toml,
186
+ # so just hardcode the URL/date for the moment, since we will moving to a stable release soon anyway.
187
+ curl https://static.rust-lang.org/dist/${{ matrix.rustc }}/rust-beta-x86_64-unknown-linux-gnu.tar.gz | tar xz
188
+ rust-beta-x86_64-unknown-linux-gnu/install.sh --without=rust-docs --prefix=$HOME/rustc
187
189
echo $HOME/rustc/bin >> $GITHUB_PATH
188
190
189
191
# Setup: rustc native libs
0 commit comments