Merge pull request #3428 from mulkieran/version-3.5.9

Version 3.5.9
stratis-storage · Aug 30, 2023 · 068274e · 068274e
2 parents df6f424 + f1e561b
commit 068274e
Show file tree

Hide file tree

Showing 29 changed files with 183 additions and 192 deletions.
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
@@ -2,8 +2,15 @@
 
 export PROFILEDIR=debug
 
-make fmt-travis && make build && make stratis-dumpmetadata && make build-min && make test && make clippy && make yamllint && make check-typos || exit 1
+make fmt-ci &&
+	make build &&
+	make stratis-dumpmetadata &&
+	make build-min &&
+	make test &&
+	make clippy &&
+	make yamllint &&
+	make check-typos || exit 1
 
 export PYTHONPATH=$PWD/tests/client-dbus/src
 
-cd tests/client-dbus && make fmt-travis && make lint || exit 1
+cd tests/client-dbus && make fmt-ci && make lint || exit 1
diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.72.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

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -34,33 +34,33 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
-          - task: make -f Makefile docs-travis
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - task: make -f Makefile docs-ci
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: >-
               TANG_URL=localhost
               make -f Makefile test-clevis-loop-should-fail
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -95,7 +95,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,11 +33,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - task: make -f Makefile fmt-travis
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - task: make -f Makefile fmt-ci
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: rustfmt
           - task: make -f Makefile check-typos
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -61,6 +61,9 @@ jobs:
         with:
           components: ${{ matrix.components }}
           toolchain: ${{ matrix.toolchain }}
+      - uses: baptiste0928/cargo-install@v2
+        with:
+          crate: typos-cli
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
@@ -74,7 +77,7 @@ jobs:
               TANG_URL=tang
               RUST_LOG=stratisd=debug
               make -f Makefile test-clevis-loop
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
             image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
     runs-on: ubuntu-22.04
@@ -152,7 +155,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.69.0  # LOWEST SUPPORTED RUST TOOLCHAIN
+          toolchain: 1.71.1  # LOWEST SUPPORTED RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd
@@ -208,7 +211,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Run stratisd-min cli tests
         run: make test-stratisd-min
       - name: Run stratis-min cli tests
@@ -229,43 +232,6 @@ jobs:
       - name: Run shell check
         run: make -f Makefile fmt-shell-ci
 
-  checks-with-ci-repo:
-    strategy:
-      matrix:
-        include:
-          - task: >
-              SET_LOWER_BOUNDS=./ci/dependency_management/set_lower_bounds
-              make -f Makefile_dependencies verify-dependency-bounds
-    runs-on: ubuntu-22.04
-    container:
-      image: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies for Fedora
-        run: >
-          dnf install -y
-          clang
-          curl
-          cryptsetup-devel
-          dbus-devel
-          device-mapper-devel
-          git
-          libblkid-devel
-          make
-          ncurses
-          openssl-devel
-          python-requests
-          python-semantic_version
-          systemd-devel
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: cargo
-          toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-      - name: Check out ci repo
-        run: git clone https://github.com/stratis-storage/ci.git
-      - name: Run ${{ matrix.task }}
-        run: ${{ matrix.task }}
-
   python-based-tests:
     runs-on: ubuntu-22.04
     container:
@@ -295,7 +261,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd
@@ -339,7 +305,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.69.0  # LOWEST SUPPORTED RUST TOOLCHAIN
+          toolchain: 1.71.1  # LOWEST SUPPORTED RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -33,9 +33,9 @@ jobs:
       matrix:
         include:
           # MANDATORY CHECKS USING CURRENT DEVELOPMENT ENVIRONMENT
-          - toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
           # MANDATORY CHECKS USING LOWEST SUPPORTED ENVIRONMENT PROXY
-          - toolchain: 1.69.0  # LOWEST SUPPORTED RUST TOOLCHAIN
+          - toolchain: 1.71.1  # LOWEST SUPPORTED RUST TOOLCHAIN
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
@@ -134,7 +134,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           components: cargo
-          toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
       - name: Build stratisd
         run: PROFILEDIR=debug make -f Makefile build-all
       - name: Install stratisd

diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -43,7 +43,7 @@ jobs:
             task: PYTHONPATH=./src make -f Makefile lint
             working-directory: ./tests/client-dbus
           - dependencies: black python3-isort
-            task: make -f Makefile fmt-travis
+            task: make -f Makefile fmt-ci
             working-directory: ./tests/client-dbus
           - dependencies: yamllint
             task: make -f Makefile yamllint

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -34,28 +34,28 @@ jobs:
       matrix:
         include:
           - task: make -f Makefile clippy
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: clippy
           - task: PROFILEDIR=debug make -f Makefile build
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile build-min
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: PROFILEDIR=debug make -f Makefile stratis-dumpmetadata
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
-          - task: make -f Makefile docs-travis
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+          - task: make -f Makefile docs-ci
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile test
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
           - task: make -f Makefile build-min
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:
@@ -93,7 +93,7 @@ jobs:
       matrix:
         include:
           - task: RUST_LOG=stratisd=debug make -f Makefile test-loop
-            toolchain: 1.71.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
             components: cargo
     runs-on: ubuntu-22.04
     container:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,44 @@
+stratisd 3.5.9
+==============
+Recommended Rust toolchain version: 1.72.0
+Lowest supported Rust toolchain version: 1.71.1
+
+- New commits:
+  * Remove trailing whitespace in CHANGES.txt
+
+- Cherry-picked commits:
+  * Update to nix 0.26.3 and fix compilation error
+  * Revert "Revert "Update lowest supported Rust to 1.71.1""
+  * Remove SET_LOWER_BOUNDS check from CI
+  * Increase serde_derive dependency lower bound to 1.0.185
+  * github actions: update recommended Rust to 1.72.0
+  * jsonrpc: Fix useless-vec lint
+  * Fix clippy manual_try_fold lints
+  * Allow clippy redundant_closure_call
+  * Remove useless .into_inter() calls
+  * Fix useless-vec lint
+  * stratisd_proc_macros v0.2.1
+  * Revert "Update lowest supported Rust to 1.71.1"
+  * Do not use fully qualified name for StratPool
+  * Update lowest supported Rust to 1.71.1
+  * Cargo.toml: add vendor-filter metadata
+  * Remove PATH and install management for audit task
+  * Remove install and PATH setting for license target
+  * Remove outdated-related targets in Makefile
+  * Remove expand-related targets in Makefile
+  * Remove Makefile entries for cargo-bloat
+  * Do not do install and PATH adjustments in Makefile for typos
+  * Add cargo-auditable modification for cargo-build and rustc
+  * github actions: update recommended Rust to 1.71.1
+  * Change -travis to -ci everywhere
+  * Decompose build-all into two sub-targets
+  * Fix bug in udev tests resulting from removing encrypted rollback
+  * Restrict min tests with feature flags
+  * Update lowest supported Rust to 1.71.0
+  * Do not use default features for retry crate
+  * Do not require the futures feature for dbus dependency
+
+
 stratisd 3.5.8
 ==============
 Recommended Rust toolchain version: 1.71.0
@@ -37,7 +78,7 @@ Recommended development platform for Python development: Fedora 38
   * Require udev support in container stratis-min-cli checks in GitHub Actions
   * Update lowest supported Rust to 1.69.0
   * Improve error message for unlock check
-  * Do not use undefined matrix field "toolchain" in GitHub Action 
+  * Do not use undefined matrix field "toolchain" in GitHub Action
   * Fix a source code typo in a test method