ci: Adjust linting job for ec2 instance, fix typo

Disable linting for ec2_all as it doesn't add much value when there's already an linting job on GH shared x86_64 runner Run linting first for all ec2 if linting is enabled Use ubuntu-latest instead of pqcp-x64 for matrix, since once the matrix is all excluded (when pushed to fork), the following jobs that depends on this won't be executed Signed-off-by: Thing-han, Lim <[email protected]>
pq-code-package · Oct 17, 2024 · fa10f49 · fa10f49
1 parent 77bb0de
commit fa10f49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,19 +23,14 @@ jobs:
         target:
          - runner: pqcp-arm64
            name: 'aarch64'
-         - runner: pqcp-x64
+         - runner: ubuntu-latest
            name: 'x86_64'
         exclude:
           - {external: true,
              target: {
                runner: pqcp-arm64,
                name: 'aarch64'
              }}
-          - {external: true,
-             target: {
-               runner: pqcp-x64,
-               name: 'x86_64'
-             }}
     name: Quickcheck (${{ matrix.target.name }})
     runs-on: ${{ matrix.target.runner }}
     steps:
@@ -81,21 +76,22 @@ jobs:
           compile_mode: nativ
           func: false
           nistkat: false
-          kat: falst
+          kat: false
       - name: native tests (+debug)
         uses: ./.github/actions/multi-functest
         with:
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           compile_mode: native
           cflags: "-DMLKEM_DEBUG"
       - name: cross tests (opt only)
-        if: ${{ matrix.target.runner == 'pqcp-arm64' && (success() || failure()) }}
         uses: ./.github/actions/multi-functest
+        if: ${{ matrix.target.runner != 'macos-latest' && (success() || failure()) }}
         with:
           nix-shell: ci-cross
           nix-cache: true
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           compile_mode: cross
+          opt: opt
           func: false
           nistkat: false
 
@@ -156,6 +152,7 @@ jobs:
       ec2_ami_id: ${{ matrix.target.ec2_ami_id }}
       compile_mode: ${{ matrix.target.compile_mode }}
       opt: ${{ matrix.target.opt }}
-      kattest: ${{ matrix.target.kattest }}
+      lint: false
       cbmc: ${{ matrix.target.cbmc == 'true' }}
+      verbose: true
     secrets: inherit
diff --git a/.github/workflows/ci_ec2_reusable.yml b/.github/workflows/ci_ec2_reusable.yml
@@ -106,6 +106,13 @@ jobs:
     runs-on: ${{ needs.start-ec2-runner.outputs.label }}
     steps:
       - uses: actions/checkout@v4
+      - name: Linting
+        if: ${{ inputs.lint }}
+        uses: ./.github/actions/lint
+        with:
+          nix-shell: ci-linter
+          gh_token: ${{ secrets.AWS_GITHUB_TOKEN }}
+          nix-verbose: ${{ inputs.verbose }}
       - name: Preprocess
         id: preprocess
         shell: bash
@@ -124,13 +131,6 @@ jobs:
           func: ${{ inputs.functest }}
           kat: ${{ inputs.kattest }}
           nistkat: ${{ inputs.nistkattest }}
-      - name: Linting
-        if: ${{ inputs.lint && (success() || failure()) }}
-        uses: ./.github/actions/lint
-        with:
-          nix-shell: ci-linter
-          nix-verbose: ${{ inputs.verbose }}
-          gh_token: ${{ secrets.AWS_GITHUB_TOKEN }}
       - name: CBMC
         if: ${{ inputs.cbmc && (success() || failure()) }}
         uses: ./.github/actions/cbmc