Skip to content

Commit

Permalink
Merge pull request #3361 from mulkieran/version-3.5.7
Browse files Browse the repository at this point in the history
Version 3.5.7
  • Loading branch information
mulkieran authored Jun 6, 2023
2 parents 58f7465 + 0979988 commit 8ed94ea
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 121 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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
- task: make -f Makefile check-typos
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:38 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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 @@ -260,7 +260,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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 @@ -295,7 +295,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
components: cargo
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- name: Build stratisd
run: PROFILEDIR=debug make -f Makefile build-all
- name: Install stratisd
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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
- toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: PROFILEDIR=debug make -f Makefile build
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile build-min
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.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.69.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.70.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-22.04
container:
Expand Down
14 changes: 14 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
stratisd 3.5.7
==============
Recommended Rust toolchain version: 1.70.0
Lowest supported Rust toolchain version: 1.66.1

Recommended development platform for Python development: Fedora 38

- Run "cargo update"
- Increase libc dependency lower bound to 0.2.143

- Cherry-picked commits:
* update recommended Rust to 1.70.0


stratisd 3.5.6
==============
Recommended Rust toolchain version: 1.69.0
Expand Down
Loading

0 comments on commit 8ed94ea

Please sign in to comment.