Skip to content

Commit

Permalink
ci: use beta release
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Ojeda <[email protected]>
  • Loading branch information
ojeda committed Jul 2, 2021
1 parent a9c675d commit 3bb8661
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
arch: [arm, arm64, ppc64le, riscv64, x86_64]
toolchain: [gcc, clang, llvm]
config: [debug, release]
rustc: [2021-05-29]
rustc: [2021-06-23]
output: [src] # [src, build]
install: [rustup] # [rustup, standalone]
sysroot: [common] # [common, custom]
Expand All @@ -30,30 +30,30 @@ jobs:

# A few independent combinations to avoid exploding the matrix:
# - The other option for `output`.
# - Different nightlies for `rustc`.
# - Different releases for `rustc`.
# - The other three (`install`, `sysroot`) combinations
# (they are interrelated, so the cross-product needs to be tested)
include:
- arch: arm64
toolchain: gcc
config: debug
rustc: 2021-05-29
rustc: 2021-06-23
output: build
install: rustup
sysroot: custom

- arch: ppc64le
toolchain: clang
config: release
rustc: 2021-05-29
rustc: 2021-06-23
output: build
install: standalone
sysroot: common

- arch: x86_64
toolchain: llvm
config: debug
rustc: 2021-05-29
rustc: 2021-06-23
output: build
install: standalone
sysroot: custom
Expand Down Expand Up @@ -178,12 +178,14 @@ jobs:
# Setup: rustc
- if: matrix.install == 'rustup'
run: |
rustup default nightly-${{ matrix.rustc }}
rustup default beta-${{ matrix.rustc }}
rustup component add rustfmt
- if: matrix.install == 'standalone'
run: |
curl https://static.rust-lang.org/dist/${{ matrix.rustc }}/rust-nightly-x86_64-unknown-linux-gnu.tar.gz | tar xz
rust-nightly-x86_64-unknown-linux-gnu/install.sh --without=rust-docs --prefix=$HOME/rustc
# FIXME: there is no beta equivalent for https://static.rust-lang.org/dist/channel-rust-x.yy.z.toml,
# so just hardcode the URL/date for the moment, since we will moving to a stable release soon anyway.
curl https://static.rust-lang.org/dist/${{ matrix.rustc }}/rust-beta-x86_64-unknown-linux-gnu.tar.gz | tar xz
rust-beta-x86_64-unknown-linux-gnu/install.sh --without=rust-docs --prefix=$HOME/rustc
echo $HOME/rustc/bin >> $GITHUB_PATH
# Setup: rustc native libs
Expand Down

0 comments on commit 3bb8661

Please sign in to comment.