Skip to content

Commit

Permalink
Merge pull request #3061 from mulkieran/version-3.2.1
Browse files Browse the repository at this point in the history
Version 3.2.1
  • Loading branch information
mulkieran authored Jul 30, 2022
2 parents 8c9e20d + c460dae commit 9574319
Show file tree
Hide file tree
Showing 14 changed files with 174 additions and 106 deletions.
4 changes: 2 additions & 2 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" make -f ../../Makefile check-fedora-versions
COMPARE_FEDORA_VERSIONS=./compare_fedora_versions MANIFEST_PATH=../../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
runs-on: ubuntu-18.04
container:
image: fedora:36 # CURRENT DEVELOPMENT ENVIRONMENT
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ jobs:
- task: make -f Makefile test
toolchain: 1.62.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
components: cargo
- task: make -f Makefile release
toolchain: 1.62.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
components: cargo
Expand Down
11 changes: 11 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
stratisd 3.2.1
==============
Recommended Rust toolchain version: 1.62.0
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


stratisd 3.2.0
==============
Recommended Rust toolchain version: 1.62.0
Expand Down
123 changes: 50 additions & 73 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stratisd"
version = "3.2.0"
version = "3.2.1"
authors = ["Stratis Developers <[email protected]>"]
edition = "2018"
build = "build.rs"
Expand Down Expand Up @@ -46,6 +46,7 @@ byteorder = "1.2.3"
clap = "3.1.0"
crc = "2.0.0"
data-encoding = "2.3.0"
devicemapper = "0.32.1"
either = "1.5.0"
env_logger="0.9.0"
futures = "0.3.11"
Expand All @@ -71,17 +72,12 @@ version = "0.4.16"
default-features = false
features = ["clock", "std"]

[dependencies.devicemapper]
version = "0.32.0"
git = "https://github.com/stratis-storage/devicemapper-rs"
branch = "crates-io-patch-0.32.0"

[dependencies.stratisd_proc_macros]
version = "0.1.0"
path = "./stratisd_proc_macros"

[dependencies.libcryptsetup-rs]
version = "0.5.0"
version = "0.5.1"
features = ["mutex"]

[dependencies.tokio]
Expand Down
Loading

0 comments on commit 9574319

Please sign in to comment.