Test on Rust 1.80 and stable

spenserblack · Aug 9, 2024 · b3fb96f · b3fb96f
1 parent 927aef6
commit b3fb96f
Showing 1 changed file with 30 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,11 +24,19 @@ jobs:
         feature-flags:
           - --no-default-features
           - --no-default-features --features color
+        rust-version:
+          - "1.80"
+          - "stable"
 
     steps:
       - uses: actions/checkout@v4
       - name: Fetch Test Branches
         run: git fetch origin test/javascript:test/javascript
+      - name: Setup Rust ${{ matrix.rust-version }}
+        uses: dtolnay/rust-toolchain@master
+        id: setup-rust
+        with:
+          toolchain: ${{ matrix.rust-version }}
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -37,7 +45,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ steps.setup-rust.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Build
         run: cargo build --verbose ${{ matrix.feature-flags }}
@@ -58,13 +66,20 @@ jobs:
         feature-flags:
           - --no-default-features
           - --no-default-features --features color
+        rust-version:
+          - "1.80"
     env:
       TARPAULIN_VERSION: "0.30.0"
 
     steps:
     - uses: actions/checkout@v4
     - name: Fetch Test Branches
       run: git fetch origin test/javascript:test/javascript
+    - name: Setup Rust ${{ matrix.rust-version }}
+      uses: dtolnay/rust-toolchain@master
+      id: setup-rust
+      with:
+        toolchain: ${{ matrix.rust-version }}
     - name: Main Cache
       uses: actions/cache@v4
       with:
@@ -73,14 +88,14 @@ jobs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        key: ${{ runner.os }}-${{ steps.setup-rust.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Bin Cache
       id: bin-cache
       uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/bin/
-        key: ${{ runner.os }}-cargo-bin-tarpaulin-${{ env.TARPAULIN_VERSION }}
+        key: ${{ runner.os }}-${{ steps.setup-rust.outputs.cachekey }}-cargo-bin-tarpaulin-${{ env.TARPAULIN_VERSION }}
     - name: Install Tarpualin
       if: steps.bin-cache.outputs.cache-hit != 'true'
       run: cargo install "cargo-tarpaulin@$TARPAULIN_VERSION"
@@ -101,7 +116,11 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@v4
-
+      - name: Setup Rust ${{ matrix.rust-version }}
+        uses: dtolnay/rust-toolchain@master
+        id: setup-rust
+        with:
+          toolchain: ${{ matrix.rust-version }}
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -110,7 +129,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ steps.setup-rust.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Check Format
         run: cargo fmt -- --check
@@ -138,7 +157,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 3
-
+      - name: Setup Rust 1.80
+        uses: dtolnay/rust-toolchain@master
+        id: setup-rust
+        with:
+          toolchain: "1.80"
       - name: Cache
         uses: actions/cache@v4
         with:
@@ -147,7 +170,7 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ steps.setup-rust.outputs.cachekey }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Fetch Test Branches
         run: git fetch origin test/javascript:test/javascript