Skip to content

Commit

Permalink
Merge pull request #3518 from bgurney-rh/latest-1.74.1
Browse files Browse the repository at this point in the history
github actions: update recommended Rust to 1.74.1
  • Loading branch information
mulkieran authored Dec 13, 2023
2 parents 7ffe13a + 4cd4732 commit 466de54
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # 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
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,39 +40,39 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run stratisd-min cli tests
run: make test-stratisd-min
- name: Run stratis-min cli tests
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
include:
- task: cargo package
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo, clippy
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- uses: baptiste0928/cargo-install@v2
with:
crate: cargo-audit
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- uses: baptiste0928/cargo-install@v2
with:
crate: cargo-audit
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # 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
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand All @@ -265,7 +265,7 @@ jobs:
strategy:
matrix:
include:
- toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.71.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-22.04
steps:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,34 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-ci
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-no-ipc
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
matrix:
include:
- task: make -f Makefile test-valgrind
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail-valgrind
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop-valgrind
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop-valgrind
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:39 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
matrix:
include:
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
- toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
- toolchain: 1.71.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.74.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.74.1 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- uses: baptiste0928/cargo-install@v2
with:
crate: cargo-audit
Expand Down

0 comments on commit 466de54

Please sign in to comment.