Skip to content

Commit

Permalink
Merge pull request stratis-storage#3333 from bgurney-rh/latest-1.69
Browse files Browse the repository at this point in the history
github actions: update recommended Rust to 1.69.0
  • Loading branch information
mulkieran authored Apr 24, 2023
2 parents ac8cc8c + 1b8bab3 commit 6f70734
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 41 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:37 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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 @@ -257,7 +257,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
- name: Run ${{ matrix.task }}
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run cargo-update
run: cargo update
- name: Run cargo-clippy
Expand All @@ -79,7 +79,7 @@ jobs:
matrix:
include:
- task: make -f Makefile audit
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
# Allowed because a failure may occur after a new Rust stable
# version is released.
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.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
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand All @@ -222,7 +222,7 @@ jobs:
strategy:
matrix:
include:
- toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-22.04
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
matrix:
include:
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
- toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
- toolchain: 1.66.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail-valgrind
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:37 # 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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
- toolchain: 1.66.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.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # 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,6 +99,6 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.68.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Run audit task on ${{ matrix.tag }}
run: make -f Makefile audit

0 comments on commit 6f70734

Please sign in to comment.