Skip to content

Commit

Permalink
Merge pull request #3090 from mulkieran/version-3.2.2
Browse files Browse the repository at this point in the history
Version 3.2.2
  • Loading branch information
mulkieran authored Aug 24, 2022
2 parents 9574319 + 6f59b50 commit 3d78e9e
Show file tree
Hide file tree
Showing 20 changed files with 346 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.58.1"
msrv = "1.62.1"
6 changes: 3 additions & 3 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- task: |
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../stratisd_proc_macros/Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../stratisd_proc_macros/Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=pretty-hex" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../Cargo.toml FEDORA_RELEASE=f35 IGNORE_ARGS="--ignore-category low --ignore-high=pretty-hex" make -f ../../Makefile check-fedora-versions
runs-on: ubuntu-18.04
container:
image: fedora:36 # CURRENT DEVELOPMENT ENVIRONMENT
Expand All @@ -52,7 +52,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
components: cargo
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
override: true
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,33 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: make -f Makefile build
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-extras
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: >-
TANG_URL=localhost
make -f Makefile test-clevis-loop-should-fail
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile release
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile release-min
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-18.04
container:
Expand All @@ -69,6 +69,7 @@ jobs:
curl
cryptsetup-devel
dbus-devel
device-mapper-persistent-data
libblkid-devel
make
systemd-devel
Expand All @@ -86,7 +87,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-18.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 @@ -28,7 +28,7 @@ jobs:
matrix:
include:
- task: make -f Makefile fmt-travis
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: rustfmt
runs-on: ubuntu-18.04
container:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
TANG_URL=tang
RUST_LOG=stratisd=debug
make -f Makefile test-clevis-loop
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
image: fedora:36 # CURRENT DEVELOPMENT ENVIRONMENT
runs-on: ubuntu-18.04
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:

stratis-cli-checks:
runs-on: ubuntu-18.04
container: fedora:34 # LOWEST SUPPORTED ENVIRONMENT PROXY
container: fedora:34 # LOWEST DEVELOPMENT ENVIRONMENT
steps:
- uses: actions/checkout@v2
- name: Install dependencies
Expand All @@ -135,7 +135,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
components: cargo
toolchain: 1.58.1 # LOWEST SUPPORTED RUST TOOLCHAIN
toolchain: 1.62.1 # LOWEST SUPPORTED RUST TOOLCHAIN
override: true
- name: Build stratisd
run: make -f Makefile install-debug
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
components: cargo
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
override: true
- name: Check out ci repo
run: git clone https://github.com/stratis-storage/ci.git
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
components: cargo
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
override: true
- name: Install all necessary Stratis files
run: make -f Makefile install-debug
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
include:
# MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
- image: fedora:36 # CURRENT DEVELOPMENT ENVIRONMENT
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
# MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
- image: fedora:34 # LOWEST DEVELOPMENT ENVIRONMENT
toolchain: 1.58.1 # LOWEST SUPPORTED RUST TOOLCHAIN
toolchain: 1.62.1 # LOWEST SUPPORTED RUST TOOLCHAIN
runs-on: ubuntu-18.04
container:
image: ${{ matrix.image }}
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
components: cargo
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
override: true
- name: Install all necessary Stratis files
run: make -f Makefile install-debug
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@ jobs:
matrix:
include:
- task: make -f Makefile clippy
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: clippy
- task: make -f Makefile build
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-min
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile build-extras
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile docs-travis
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile test
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile release
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
- task: make -f Makefile release-min
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-18.04
container:
Expand All @@ -71,6 +71,7 @@ jobs:
libsystemd-dev
libudev-dev
make
thin-provisioning-tools
- uses: actions-rs/toolchain@v1
with:
components: ${{ matrix.components }}
Expand All @@ -85,7 +86,7 @@ jobs:
matrix:
include:
- task: RUST_LOG=stratisd=debug make -f Makefile test-loop
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
toolchain: 1.63.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
runs-on: ubuntu-18.04
container:
Expand Down
13 changes: 12 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
stratisd 3.2.2
==============
Recommended Rust toolchain version: 1.63.0
Lowest supported Rust toolchain version: 1.62.1

Recommended development platform for Python development: Fedora 36

- Release version 3.2.2:
https://github.com/stratis-storage/stratisd/pull/3090


stratisd 3.2.1
==============
Recommended Rust toolchain version: 1.62.0
Expand All @@ -6,7 +17,7 @@ Lowest supported Rust toolchain version: 1.58.1
Recommended development platform for Python development: Fedora 36

- Release version 3.2.1:
https://github.com/stratis-storage/stratisd/pull/3006
https://github.com/stratis-storage/stratisd/pull/3061


stratisd 3.2.0
Expand Down
Loading

0 comments on commit 3d78e9e

Please sign in to comment.