refactoring: directly use cabal-audit

blackheaven · Aug 29, 2024 · f6430d7 · f6430d7
1 parent 85410a4
commit f6430d7
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 1,555 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,13 +20,11 @@ jobs:
         extra_nix_config: |
           system-features = nixos-test benchmark big-parallel kvm
     - uses: DeterminateSystems/magic-nix-cache-action@main
-    - run: nix build -L '.#packages.x86_64-linux."static-x86_64-unknown-linux-musl:github-action-scan:exe:github-action-scan"'
-    - run: nix flake check
     - name: Extract tag name
       shell: bash
       run: echo "tag=$(echo ${GITHUB_REF##*/})" >> $GITHUB_OUTPUT
       id: extract_tag
-    - run: nix build -L '.#packages.x86_64-linux.github-action-scan-image'
+    - run: nix build -L
     - run: docker load -i result
     - name: Log in to the Container registry
       if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')

diff --git a/action.yaml b/action.yaml
@@ -48,7 +48,7 @@ runs:
         CHECKOUT_PATH: ${{ inputs.checkout_path }}
       run: |
         cd "$CHECKOUT_PATH"
-        ./github-action-scan --sarif results.sarif
+        ./cabal-audit --sarif | tee results.sarif
         cat results.sarif
     - name: Upload SARIF file
       id: upload-sarif

diff --git a/app/Main.hs b/app/Main.hs
diff --git a/cabal.project b/cabal.project