Skip to content

Commit b11a1e9

Browse files
committed
rust: move to stable rustc release (1.54.0)
Signed-off-by: Miguel Ojeda <[email protected]>
1 parent a7653d2 commit b11a1e9

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 9 deletions
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-06-23]
16+
rustc: [1.54.0]
1717
output: [src] # [src, build]
1818
install: [rustup] # [rustup, standalone]
1919
sysroot: [common] # [common, custom]
@@ -37,23 +37,23 @@ jobs:
3737
- arch: arm64
3838
toolchain: gcc
3939
config: debug
40-
rustc: 2021-06-23
40+
rustc: 1.54.0
4141
output: build
4242
install: rustup
4343
sysroot: custom
4444

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

5353
- arch: x86_64
5454
toolchain: llvm
5555
config: debug
56-
rustc: 2021-06-23
56+
rustc: 1.54.0
5757
output: build
5858
install: standalone
5959
sysroot: custom
@@ -178,14 +178,12 @@ jobs:
178178
# Setup: rustc
179179
- if: matrix.install == 'rustup'
180180
run: |
181-
rustup default beta-${{ matrix.rustc }}
181+
rustup default ${{ matrix.rustc }}
182182
rustup component add rustfmt
183183
- if: matrix.install == 'standalone'
184184
run: |
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
185+
curl https://static.rust-lang.org/dist/rust-${{ matrix.rustc }}-x86_64-unknown-linux-gnu.tar.gz | tar xz
186+
rust-${{ matrix.rustc }}-x86_64-unknown-linux-gnu/install.sh --without=rust-docs --prefix=$HOME/rustc
189187
echo $HOME/rustc/bin >> $GITHUB_PATH
190188
191189
# Setup: rustc native libs

Documentation/process/changes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ know what you are doing, use the exact version listed here. Please see
3636
====================== =============== ========================================
3737
GNU C 4.9 gcc --version
3838
Clang/LLVM (optional) 10.0.1 clang --version
39-
rustc (optional) 1.54.0-beta.1 rustc --version
39+
rustc (optional) 1.54.0 rustc --version
4040
bindgen (optional) 0.56.0 bindgen --version
4141
GNU make 3.81 make --version
4242
binutils 2.23 ld -v

Documentation/rust/quick-start.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ at the time of writing, they are likely to not be recent enough.
2323
rustc
2424
*****
2525

26-
A particular version (`1.54.0-beta.1`) of the Rust compiler is required.
27-
Newer versions may or may not work because, for the moment, we depend on
28-
some unstable Rust features.
26+
A particular version of the Rust compiler is required. Newer versions may or
27+
may not work because, for the moment, we depend on some unstable Rust features.
2928

3029
If you are using ``rustup``, enter the checked out source code directory
3130
and run::
3231

33-
rustup override set beta-2021-06-23
32+
rustup override set 1.54.0
3433

3534
Otherwise, fetch a standalone installer or install ``rustup`` from:
3635

0 commit comments

Comments
 (0)