Skip to content

Commit 08656c4

Browse files
committed
ci: use beta release
Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 0c123bd commit 08656c4

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/ci.yaml

+10-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
arch: [arm, arm64, ppc64le, riscv64, x86_64]
1414
toolchain: [gcc, clang, llvm]
1515
config: [debug, release]
16-
rustc: [2021-05-29]
16+
rustc: [2021-06-23]
1717
output: [src] # [src, build]
1818
install: [rustup] # [rustup, standalone]
1919
sysroot: [common] # [common, custom]
@@ -30,30 +30,30 @@ jobs:
3030

3131
# A few independent combinations to avoid exploding the matrix:
3232
# - The other option for `output`.
33-
# - Different nightlies for `rustc`.
33+
# - Different releases for `rustc`.
3434
# - The other three (`install`, `sysroot`) combinations
3535
# (they are interrelated, so the cross-product needs to be tested)
3636
include:
3737
- arch: arm64
3838
toolchain: gcc
3939
config: debug
40-
rustc: 2021-05-29
40+
rustc: 2021-06-23
4141
output: build
4242
install: rustup
4343
sysroot: custom
4444

4545
- arch: ppc64le
4646
toolchain: clang
4747
config: release
48-
rustc: 2021-05-29
48+
rustc: 2021-06-23
4949
output: build
5050
install: standalone
5151
sysroot: common
5252

5353
- arch: x86_64
5454
toolchain: llvm
5555
config: debug
56-
rustc: 2021-05-29
56+
rustc: 2021-06-23
5757
output: build
5858
install: standalone
5959
sysroot: custom
@@ -178,12 +178,14 @@ jobs:
178178
# Setup: rustc
179179
- if: matrix.install == 'rustup'
180180
run: |
181-
rustup default nightly-${{ matrix.rustc }}
181+
rustup default beta-${{ matrix.rustc }}
182182
rustup component add rustfmt
183183
- if: matrix.install == 'standalone'
184184
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
187189
echo $HOME/rustc/bin >> $GITHUB_PATH
188190
189191
# Setup: rustc native libs

0 commit comments

Comments
 (0)