Merge pull request #3460 from mulkieran/issue_stratisd_3456

Issue stratisd 3456
stratis-storage · Oct 3, 2023 · 76206cd · 76206cd
2 parents 0e8e36b + 4fe7aff
commit 76206cd
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 3 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -81,9 +81,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - task: make -f Makefile audit
-            toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
-            components: cargo
           # Allowed because a failure may occur after a new Rust stable
           # version is released.
           - task: make -f Makefile clippy
@@ -118,6 +115,46 @@ jobs:
       - name: Test ${{ matrix.task }} on ${{ matrix.toolchain }} toolchain
         run: ${{ matrix.task }}
 
+  cargo-audit-checks:
+    continue-on-error: true
+    strategy:
+      matrix:
+        include:
+          - task: make -f Makefile audit
+          - task: AUDITABLE=1 PROFILEDIR=debug make -f Makefile audit-all-rust
+    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
+          glibc-static
+          libblkid-devel
+          make
+          ncurses
+          openssl-devel
+          python-requests
+          python-semantic_version
+          systemd-devel
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          components: cargo
+          toolchain: 1.72.0  # CURRENT DEVELOPMENT RUST TOOLCHAIN
+      - uses: baptiste0928/cargo-install@v2
+        with:
+          crate: cargo-audit
+      - uses: baptiste0928/cargo-install@v2
+        with:
+          crate: cargo-auditable
+      - name: Run matrix task
+        run: ${{ matrix.task }}
+
   checks-with-ci-repo:
     runs-on: ubuntu-22.04
     container:

diff --git a/Makefile b/Makefile
@@ -156,6 +156,17 @@ license:
 audit:
 	cargo audit -D warnings
 
+## Audit Rust executables
+audit-all-rust: build-all-rust
+	cargo audit -D warnings bin \
+		./target/${PROFILEDIR}/stratisd \
+		./target/${PROFILEDIR}/stratisd-min \
+		./target/${PROFILEDIR}/stratis-min \
+		./target/${PROFILEDIR}/stratis-utils \
+	        ./target/${PROFILEDIR}/stratis-str-cmp \
+	        ./target/${PROFILEDIR}/stratis-base32-decode \
+	        ./target/${PROFILEDIR}/stratis-dumpmetadata
+
 ## Check for spelling errors
 check-typos:
 	typos
@@ -462,6 +473,7 @@ clippy: clippy-macros clippy-min clippy-udev-utils clippy-no-ipc
 
 .PHONY:
 	audit
+	audit-all-rust
 	build
 	build-all
 	build-all-man