Merge pull request #150 from bgurney-rh/latest-1.75

github actions: update recommended Rust to 1.75.0
stratis-storage · Jan 3, 2024 · decf827 · decf827
2 parents d56f549 + 7f25911
commit decf827
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -38,7 +38,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Check out ci repo
         run: git clone https://github.com/stratis-storage/ci.git
       - name: Run comparisons of version specs with available Fedora packages

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,22 +24,22 @@ jobs:
         include:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT COMPILER
           - components: rustfmt
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: fmt-ci
           - components: clippy
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: clippy
           - components: cargo
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: build
           - components: cargo
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: test
           - components: cargo
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: docs-ci
           - components: cargo
-            toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             task: check-typos
           # MANDATORY TESTING USING LOWEST SUPPORTED COMPILER
           - components: cargo
@@ -52,13 +52,13 @@ jobs:
         with:
           components: ${{ matrix.components }}
           toolchain: ${{ matrix.toolchain }}
-      - uses: baptiste0928/cargo-install@v2
-        with:
-          crate: typos-cli
       - name: Install dependencies
         run: |
           sudo apt-get -q update
           sudo apt-get -y install libblkid-dev
+      - name: Install typos-cli if required
+        # yamllint disable rule:line-length
+        run: ${{ matrix.task == 'check-typos' && 'cargo install typos-cli' || 'true' }}
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: make -f Makefile ${{ matrix.task }}
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.74.1  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.75.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Check out ci repo
         run: git clone https://github.com/stratis-storage/ci.git
       - name: Run comparisons of version specs with available Fedora packages