Moves Clippy lints checking to a separate job.

This fixes parallaxsecond#468. Signed-off-by: Jesper Brynolf <jesper.brynolf@gmail.com>
Superhepper · Dec 18, 2023 · e2e86ef · e2e86ef
1 parent 2dfc315
commit e2e86ef
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,3 +96,16 @@ jobs:
         run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
       - name: Check documentation
         run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi -e RUSTDOCFLAGS="-Dwarnings" ubuntucontainer cargo doc --document-private-items --no-deps
+
+  # Check that there are no Clippy lint errors.
+  clippy:
+    name: Check Clippy lints
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the container
+        run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu  --target tpm2-tss
+      - name: Check Clippy lints MSRV
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.66.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/lint-checks.sh
+      - name: Check Clippy lints latest
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/lint-checks.sh
diff --git a/tss-esapi/tests/Dockerfile-ubuntu b/tss-esapi/tests/Dockerfile-ubuntu
@@ -1,10 +1,15 @@
-FROM ghcr.io/tpm2-software/ubuntu-18.04:latest
+FROM ghcr.io/tpm2-software/ubuntu-18.04:latest AS base
 
+FROM base AS rust-toolchain
+# Install Rust toolchain
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+FROM rust-toolchain AS tpm2-tss
+# Download and install the TSS library
 ARG TPM2_TSS_VERSION=2.4.6
 ENV TPM2_TSS_VERSION=$TPM2_TSS_VERSION
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
-
-# Download and install the TSS library
 RUN git clone https://github.com/tpm2-software/tpm2-tss.git --branch $TPM2_TSS_VERSION
 RUN cd tpm2-tss \
 	&& ./bootstrap \
@@ -13,13 +18,10 @@ RUN cd tpm2-tss \
 	&& make install \
 	&& ldconfig
 
+FROM tpm2-tss AS tpm2-tools
 # Download and install TPM2 tools
 RUN git clone https://github.com/tpm2-software/tpm2-tools.git --branch 4.1
 RUN cd tpm2-tools \
 	&& ./bootstrap \
 	&& ./configure --enable-unit \
 	&& make install
-
-# Install Rust toolchain
-RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
diff --git a/tss-esapi/tests/all-fedora.sh b/tss-esapi/tests/all-fedora.sh
@@ -3,7 +3,7 @@
 # Copyright 2019 Contributors to the Parsec project.
 # SPDX-License-Identifier: Apache-2.0
 
-# This script executes static checks and tests for the tss-esapi crate.
+# This script executes tests for the tss-esapi crate.
 # It can be run inside the container which Dockerfile is in the same folder.
 #
 # Usage: ./tests/all.sh
@@ -33,11 +33,6 @@ tpm2-abrmd \
     --session \
     --flush-all &
 
-##################
-# Execute clippy #
-##################
-cargo clippy --all-targets --all-features -- -D clippy::all -D clippy::cargo
-
 ###################
 # Build the crate #
 ###################

diff --git a/tss-esapi/tests/all-ubuntu.sh b/tss-esapi/tests/all-ubuntu.sh
@@ -3,7 +3,7 @@
 # Copyright 2019 Contributors to the Parsec project.
 # SPDX-License-Identifier: Apache-2.0
 
-# This script executes static checks and tests for the tss-esapi crate.
+# This script executes tests for the tss-esapi crate.
 # It can be run inside the container which Dockerfile is in the same folder.
 #
 # Usage: ./tests/all.sh
@@ -36,11 +36,6 @@ tpm_server &
 sleep 5
 tpm2_startup -c -T mssim
 
-##################
-# Execute clippy #
-##################
-cargo clippy --all-targets --all-features -- -D clippy::all -D clippy::cargo
-
 ###################
 # Build the crate #
 ###################

diff --git a/tss-esapi/tests/lint-checks.sh b/tss-esapi/tests/lint-checks.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Copyright 2023 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+
+# This script executes static checks for the tss-esapi crate.
+
+set -euf -o pipefail
+
+#################################################
+# Change rust toolchain version
+#################################################
+if [[ ! -z ${RUST_TOOLCHAIN_VERSION:+x} ]]; then
+	rustup override set ${RUST_TOOLCHAIN_VERSION}
+	# Use the frozen Cargo lock to prevent any drift from MSRV being upgraded
+	# underneath our feet.
+	cp tests/Cargo.lock.frozen ../Cargo.lock
+fi
+
+##################
+# Execute clippy #
+##################
+cargo clippy --all-targets --all-features -- -D clippy::all -D clippy::cargo