Merge branch 'ci' into 'master'

remram44 · Dec 11, 2024 · 28d3eb8 · 28d3eb8
2 parents 290290b + dcd111e
commit 28d3eb8
Show file tree

Hide file tree

Showing 3 changed files with 360 additions and 5 deletions.
diff --git a/.ci-Cargo.lock-1.22.0 b/.ci-Cargo.lock-1.22.0
diff --git a/.ci-Cargo.lock-1.31.0 b/.ci-Cargo.lock-1.31.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,17 +13,16 @@ jobs:
         rust-version: [1.22.0, 1.31.0, stable, nightly]
         include:
         - os: macos-latest
-          rust-version: 1.31.0
+          rust-version: 1.75.0
         - os: windows-latest
           rust-version: 1.31.0
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Rust ${{ matrix.rust-version }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust-version }}
-        override: true
+      run: rustup toolchain install ${{ matrix.rust-version }} --profile minimal
+    - name: Import fixed Cargo.lock file
+      run: if [ -e .ci-Cargo.lock-${{ matrix.rust-version }} ]; then cp .ci-Cargo.lock-${{ matrix.rust-version }} Cargo.lock; fi
     - name: Build
       run: cargo build --verbose
     - name: Run tests