From e5104f6aec207c85a240c2197404fc56db38a9dc Mon Sep 17 00:00:00 2001 From: Bryan Gurney Date: Wed, 3 Jan 2024 13:48:41 -0500 Subject: [PATCH 1/2] github actions: update recommended Rust to 1.75.0 Signed-off-by: Bryan Gurney --- .github/workflows/cargo.yml | 2 +- .github/workflows/main.yml | 12 ++++++------ .github/workflows/nightly.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index d0ba689..ade0b40 100644 --- 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 index 89afe63..e2f3e3f 100644 --- 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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0bb020f..46a8347 100644 --- 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 From 7f25911210902ba7d575de180b8c0c458973ff44 Mon Sep 17 00:00:00 2001 From: Bryan Gurney Date: Wed, 3 Jan 2024 15:28:22 -0500 Subject: [PATCH 2/2] github workflows main: Install typos-cli if required Signed-off-by: Bryan Gurney --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2f3e3f..53c6cbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 }}