chore(ci): bump rust version to 1.81

astriaorg · Sep 19, 2024 · 5184de1 · 5184de1
1 parent eb466d9
commit 5184de1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -13,6 +13,8 @@ on:
 env:
   REGISTRY: ghcr.io
   FULL_REF: ${{ inputs.tag && format('refs/tags/{0}', inputs.tag) || github.ref }}
+  # This must match the entry in rustup-toolchain.toml at the repository root
+  RUSTUP_TOOLCHAIN: "1.81.0"
 
 jobs:
   upload-binaries:
@@ -34,7 +36,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.tag }}
-      - uses: dtolnay/rust-toolchain@1.76.0
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: arduino/setup-protoc@v3
         with:
           version: "24.4"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,6 +2,9 @@ name: Test
 env:
   CI: true
   RUSTFLAGS: "-D warnings -D unreachable-pub --cfg tokio_unstable"
+
+  # This must match the entry in rustup-toolchain.toml at the repository root
+  RUSTUP_TOOLCHAIN: "1.81.0"
 on:
   pull_request:
   merge_group:
@@ -26,7 +29,9 @@ jobs:
           version: "1.32.0"
           github_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.76.0
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "buildjet"
@@ -51,7 +56,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.76.0
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "buildjet"
@@ -77,7 +84,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: taiki-e/install-action@v2.15.2
         with:
           tool: cargo-hack@0.5.29
@@ -100,7 +109,9 @@ jobs:
     if: needs.run_checker.outputs.run_tests == 'true'
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "github"
@@ -113,7 +124,9 @@ jobs:
     if: needs.run_checker.outputs.run_audit == 'true'
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: rustsec/audit-check@v1.4.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -126,7 +139,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "buildjet"
@@ -154,7 +169,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "buildjet"
@@ -179,7 +196,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@1.76.0
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
       - uses: Swatinem/rust-cache@v2.7.3
         with:
           cache-provider: "buildjet"
@@ -198,8 +217,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@1.78.0
+      - uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: {{ env.RUSTUP_TOOLCHAIN }}
           components: clippy
       - uses: Swatinem/rust-cache@v2.7.3
         with:
@@ -226,7 +246,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: dtolnay/rust-toolchain@v1
+      - uses: dtolnay/rust-toolchain@master
         with:
           # This has to match `rust-toolchain` in the rust-toolchain file of the dylint lints
           toolchain: nightly-2023-12-28

diff --git a/containerfiles/Dockerfile b/containerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM rust:1.76-bookworm AS rust
+FROM --platform=$BUILDPLATFORM rust:1.81-bookworm AS rust
 
 WORKDIR /build/
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.81.0"