Start using rustc 1.77.0 instead of older nightly

gluwa · Apr 23, 2024 · bb1fbe8 · bb1fbe8
1 parent 0d42d61
commit bb1fbe8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,11 +16,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+
+    - name: Configure rustc version
+      run: |
+        RUSTC_VERSION=$(grep channel rust-toolchain.toml | tail -n1 | tr -d " " | cut -f2 -d'"')
+        echo "RUSTC_VERSION=$RUSTC_VERSION" >> "$GITHUB_ENV"
+
     - name: Rust Setup
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: nightly-2023-05-23
+        toolchain:  ${{ env.RUSTC_VERSION }}
         target: wasm32-unknown-unknown
         override: true
     - name: Install protoc
@@ -35,11 +41,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+
+    - name: Configure rustc version
+      run: |
+        RUSTC_VERSION=$(grep channel rust-toolchain.toml | tail -n1 | tr -d " " | cut -f2 -d'"')
+        echo "RUSTC_VERSION=$RUSTC_VERSION" >> "$GITHUB_ENV"
+
     - name: Rust Setup
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: nightly-2023-05-23
+        toolchain:  ${{ env.RUSTC_VERSION }}
         target: wasm32-unknown-unknown
         override: true
     - name: Install protoc
@@ -68,11 +80,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+
+    - name: Configure rustc version
+      run: |
+        RUSTC_VERSION=$(grep channel rust-toolchain.toml | tail -n1 | tr -d " " | cut -f2 -d'"')
+        echo "RUSTC_VERSION=$RUSTC_VERSION" >> "$GITHUB_ENV"
+
     - name: Rust Setup
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: nightly-2023-05-23
+        toolchain:  ${{ env.RUSTC_VERSION }}
         target: wasm32-unknown-unknown
         override: true
         components: rustfmt, clippy

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,8 +1,5 @@
 [toolchain]
-# Stable
-#channel   = "1.70.0" # rustc 1.70.0 (84c898d65 2023-05-13)
-# Nightly
-channel    = "nightly-2023-05-23" # rustc 1.71.0-nightly (8b4b20836 2023-05-22)
+channel    = "1.77.0" # rustc 1.77.0 (aedd173a2 2024-03-17)
 components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src"]
 profile    = "minimal"
 targets    = ["wasm32-unknown-unknown"]