CI reform, round 2

.github/workflows/common-testing-big-instance.yml

@@ -29,7 +29,7 @@ on:
         type: string
         required: false
         default: "-F wasm_tests"
-      package-name:
+      crate-names:
         type: string
         required: true
       test-coverage:
@@ -48,9 +48,6 @@ on:
         type: string
         required: false
         default: "big-instance"
-      app-cache-dir:
-        type: string
-        required: true
       nextest-profile:
         type: string
         required: false
@@ -141,11 +138,10 @@ jobs:
       run-minio: ${{ inputs.run-minio }}
       run-redis: ${{ inputs.run-redis }}
       run-wasm: ${{ inputs.run-wasm }}
-      package-name: ${{ inputs.package-name }}
+      crate-names: ${{ inputs.crate-names }}
       wasm-test-feature: ${{ inputs.wasm-test-feature }}
       test-coverage: ${{ inputs.test-coverage }}
       npm-release: ${{ inputs.npm-release }}
-      app-cache-dir: ${{ inputs.app-cache-dir }}
       nextest-profile: ${{ inputs.nextest-profile }}
       nextest-test-threads: ${{ inputs.nextest-test-threads }}
 

.github/workflows/common-testing.yml

@@ -43,12 +43,10 @@ on:
         type: string
         required: false
         default: '-F wasm_tests'
-      package-name:
-        # A list of packages forwarded to cargo to run, e.g.
-        # `-p abc -p def -p ghi`. Injected verbatim into `cargo clippy`
-        # (and effectively into nextest via `args-tests`).
-        # TODO(dp): rename to `crate-names` (plural) — it's a list and
-        # we call them crates, not packages.
+      crate-names:
+        # A list of packages forwarded to cargo, e.g. `-p abc -p def -p ghi`.
+        # Injected verbatim into `cargo clippy` (and effectively into nextest
+        # via `args-tests`).
         type: string
         required: true
       skip-test-material:
@@ -70,12 +68,6 @@ on:
         type: boolean
         required: false
         default: false
-      app-cache-dir:
-        # TODO(dp): unused — not referenced in any step in this workflow.
-        # Remove it here, in common-testing-big-instance.yml, and from all
-        # callers in main.yml.
-        type: string
-        required: true
       nextest-profile:
         type: string
         required: false
@@ -205,7 +197,7 @@ jobs:
         uses: ./.github/actions/setup-rust-and-protoc
         with:
           rust-toolchain: ${{ env.RUST_IMAGE_VERSION }}
-          rust-components: rustfmt, clippy, llvm-tools-preview, llvm-tools
+          rust-components: llvm-tools-preview, llvm-tools
           rust-cache: "false"
           protoc-version: '26.1'
           protoc-repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -261,35 +253,6 @@ jobs:
           mc mb "${MINIO_ALIAS}/${MINIO_BUCKET}"
           mc anonymous set public "${MINIO_ALIAS}/${MINIO_BUCKET}"
 
-      - name: Setup cargo dylint
-        run: |
-          cargo install cargo-dylint dylint-link --force
-
-      - name: clippy and rustfmt versions
-        run: |
-          cargo clippy -V && cargo fmt --version
-
-      - name: Formatting
-        run: cargo fmt --all -- --check
-
-      # - name: Linting default features
-      #   env:
-      #     PACKAGE_NAME: ${{inputs.package-name}}
-      #   run: cargo clippy --all-targets --package "${PACKAGE_NAME}" -- -D warnings
-
-      # TODO(dp): Clippy is cheap; replace per-crate clippy with a single workspace-level
-      # `cargo clippy --workspace --all-targets --all-features` job.
-      - name: Linting All features
-        env:
-          PACKAGE_NAME: ${{inputs.package-name}}
-        run: |
-          echo "EXECUTING: cargo clippy --all-targets --all-features ${PACKAGE_NAME} -- -D warnings"
-          # shellcheck disable=SC2086  # intentional word-splitting: PACKAGE_NAME is a flag list like `-p a -p b`
-          cargo clippy --all-targets --all-features ${PACKAGE_NAME} -- -D warnings
-
-      - name: Linting dylint
-        run: cargo dylint --all
-
       # Download pre-generated default test material if available (for slow_tests jobs)
       - name: Download Test Material (Default)
         if: ${{ inputs.use-pregenerated-material }}
@@ -308,25 +271,23 @@ jobs:
           rm test-material-default.tar.gz
           ls -la ./test-material/
 
-      # Generate testing material (always needed, small and fast to generate)
-      # Must run from workspace root, not working-directory
-      - name: Generate Test Material (Testing)
-        if: ${{ ! inputs.skip-test-material }}
-        working-directory: .
-        run: |
-          echo "Generating testing material..."
-          echo "EXECUTING: cargo run -p generate-test-material -- --output ./test-material --verbose testing"
-          cargo run -p generate-test-material -- --output ./test-material --verbose testing
-
-      # Generate default material when explicitly requested or for slow_tests,
-      # and only when not using pre-generated artifacts.
-      - name: Generate Test Material (Default)
-        if: ${{ ! inputs.skip-test-material && ! inputs.use-pregenerated-material && (inputs.generate-default-material || contains(inputs.args-tests, 'slow_tests')) }}
+      # Generate test material. Subcommand is `all` (testing + default) when
+      # the job uses slow_tests or explicitly requests default; otherwise
+      # `testing` only. Must run from workspace root, not working-directory.
+      - name: Generate Test Material
+        if: ${{ ! inputs.skip-test-material && ! inputs.use-pregenerated-material }}
         working-directory: .
+        env:
+          GENERATE_DEFAULT: ${{ inputs.generate-default-material }}
+          ARGS_TESTS: ${{ inputs.args-tests }}
         run: |
-          echo "Generating default test material..."
-          echo "EXECUTING: cargo run -p generate-test-material --features slow_tests -- --output ./test-material --verbose default"
-          cargo run -p generate-test-material --features slow_tests -- --output ./test-material --verbose default
+          if [[ "${GENERATE_DEFAULT}" == "true" ]] || [[ "${ARGS_TESTS}" == *slow_tests* ]]; then
+            SUBCOMMAND=all
+          else
+            SUBCOMMAND=testing
+          fi
+          echo "EXECUTING: cargo run -p generate-test-material -- --output ./test-material --verbose ${SUBCOMMAND}"
+          cargo run -p generate-test-material -- --output ./test-material --verbose "${SUBCOMMAND}"
 
       # Build kms-custodian binary required by integration tests
       - name: Build kms-custodian binary
@@ -480,9 +441,9 @@ jobs:
         if: always()
         id: logs-label
         env:
-          PACKAGE_NAME: ${{ inputs.package-name }}
+          CRATE_NAMES: ${{ inputs.crate-names }}
         shell: bash
-        run: echo "value=$(echo "${PACKAGE_NAME}" | sed -E 's/-p +//g' | tr ' ' '_')" >> "$GITHUB_OUTPUT"
+        run: echo "value=$(echo "${CRATE_NAMES}" | sed -E 's/-p +//g' | tr ' ' '_')" >> "$GITHUB_OUTPUT"
 
       - name: Archive integration test trace logs
         if: always()