Skip to content

Commit b87c82e

Browse files
chriskrychorwjblue
andcommitted
Update Rust version to 1.75
We originally pinned to 1.63 because that was the last version before Rust dropped support for older versions of `glibc` [in Rust 1.64][blog]. However, the relevant operating systems we were maintaining support for at that time (CentOS/RHEL 6) have now been end-of-life for three full years, so it seems reasonable to update to a more current version. Since no other changes to the `glibc` support have happened in the interval, we can safely update to the most current version of Rust. As part of this, update the RHEL 7 Dockerfile setup for building on Rust 1.75, including using updated versions of gcc and binutils. [blog]: https://blog.rust-lang.org/2022/08/01/Increasing-glibc-kernel-requirements.html Co-authored-by: Rob Jackson <[email protected]>
1 parent 370f7a0 commit b87c82e

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

.github/workflows/api-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up cargo
1818
uses: dtolnay/rust-toolchain@master
1919
with:
20-
toolchain: 1.63
20+
toolchain: 1.75
2121
- name: Cargo Cache
2222
uses: Swatinem/rust-cache@v2
2323
- name: Build docs

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up cargo
4444
uses: dtolnay/rust-toolchain@master
4545
with:
46-
toolchain: 1.63
46+
toolchain: 1.75
4747
- name: Cargo Cache
4848
uses: Swatinem/rust-cache@v2
4949
- name: Compile and package Volta
@@ -63,7 +63,7 @@ jobs:
6363
- name: Set up cargo
6464
uses: dtolnay/rust-toolchain@master
6565
with:
66-
toolchain: 1.63
66+
toolchain: 1.75
6767
target: aarch64-apple-darwin
6868
- name: Cargo Cache
6969
uses: Swatinem/rust-cache@v2
@@ -84,7 +84,7 @@ jobs:
8484
- name: Set up cargo
8585
uses: dtolnay/rust-toolchain@master
8686
with:
87-
toolchain: 1.63
87+
toolchain: 1.75
8888
- name: Cargo Cache
8989
uses: Swatinem/rust-cache@v2
9090
- name: Add cargo-wix subcommand

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up cargo
2727
uses: dtolnay/rust-toolchain@master
2828
with:
29-
toolchain: 1.63
29+
toolchain: 1.75
3030
components: clippy
3131
- name: Cargo Cache
3232
uses: Swatinem/rust-cache@v2
@@ -50,7 +50,7 @@ jobs:
5050
- name: Set up cargo
5151
uses: dtolnay/rust-toolchain@master
5252
with:
53-
toolchain: 1.63
53+
toolchain: 1.75
5454
- name: Cargo Cache
5555
uses: Swatinem/rust-cache@v2
5656
- name: Run tests
@@ -77,7 +77,7 @@ jobs:
7777
- name: Set up cargo
7878
uses: dtolnay/rust-toolchain@master
7979
with:
80-
toolchain: 1.63
80+
toolchain: 1.75
8181
components: rustfmt
8282
- name: Cargo Cache
8383
uses: Swatinem/rust-cache@v2

ci/build-linux.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set -e
44

55
# Activate the upgraded versions of GCC and binutils
6-
source /opt/rh/devtoolset-2/enable
6+
# See https://linux.web.cern.ch/centos7/docs/softwarecollections/#inst
7+
source /opt/rh/devtoolset-8/enable
78

89
echo "Building Volta"
910

ci/docker/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
FROM cern/slc6-base
1+
FROM cern/cc7-base
22

33
# This repo file references a URL that is no longer valid. It also isn't used by the build
44
# toolchain, so we can safely remove it entirely
55
RUN rm /etc/yum.repos.d/epel.repo
66

7+
# https://linux.web.cern.ch/centos7/docs/softwarecollections/#inst
78
# Tools needed for the build and setup process
89
RUN yum -y install wget tar
910
# Fetch the repo information for the devtoolset repo
10-
RUN wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
11-
# Install more recent GCC and binutils, to allow us to compile
12-
RUN yum -y install devtoolset-2-gcc devtoolset-2-binutils
11+
RUN yum install -y centos-release-scl
12+
# Install more recent GCC and binutils, to allow us to compile
13+
RUN yum install -y devtoolset-8
1314

14-
# Install Rust toolchain (need to do this manually since current rustup requires a more recent
15-
# glibc version than is available on RHEL/CentOS 6)
16-
RUN curl https://static.rust-lang.org/rustup/archive/1.25.1/x86_64-unknown-linux-gnu/rustup-init -sSf -o ~/rustup-init
17-
RUN chmod +x ~/rustup-init
18-
RUN ~/rustup-init -y --default-toolchain 1.63
15+
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
1916
ENV PATH="/root/.cargo/bin:${PATH}"

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.63"
2+
channel = "1.75"
33
components = ["clippy", "rustfmt"]
44
profile = "minimal"

0 commit comments

Comments
 (0)