From ac4ddf49b3d8bf51dee2ecbd5332973a638ffa48 Mon Sep 17 00:00:00 2001 From: Terri Oda Date: Mon, 16 Dec 2024 12:12:42 -0800 Subject: [PATCH] ci: address syntax errors in testing.yml Signed-off-by: Terri Oda --- .github/workflows/testing.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e584507fb4..eab687246d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -256,12 +256,6 @@ jobs: test_scanner.py test_cli.py cli.py - - uses: haya14busa/action-cond@94f77f7a80cd666cb3155084e428254fea4281fd # v1.2.1 - id: git-diff - with: - cond: ${{ (github.event.inputs.longTests == 'true') || (env.GIT_DIFF != '') }} - if_true: '1' - if_false: '0' - name: Install cabextract if: env.sbom != 'true' run: sudo apt-get update && sudo apt-get install cabextract @@ -285,7 +279,7 @@ jobs: NO_EXIT_CVE_NUM=1 python -m cve_bin_tool.cli test/assets/test-kerberos-5-1.15.1.out cp -r ~/.cache/cve-bin-tool cache - name: Run async tests - if: env.sbom != 'true' && ${{ matrix.testgroup == 'async' }} + if: env.sbom != 'true' && ${{ matrix.testgroup }} == 'async' env: LONG_TESTS: ${{ steps.git-diff.outputs.value }} run: > @@ -298,21 +292,21 @@ jobs: --ignore=test/test_scanner.py --ignore=test/test_language_parser.py - name: Run language parser tests - if: env.sbom != 'true' && ${{ matrix.testgroup == 'language' }} + if: env.sbom != 'true' && ${{ matrix.testgroup }} == 'language' env: LONG_TESTS: ${{ steps.git-diff.outputs.value }} run: > pytest --cov --cov-append -n 4 -v --durations=50 test/test_language_parser.py - name: Run scanner tests - if: env.sbom != 'true' && ${{ matrix.testgroup == 'scanner' }} + if: env.sbom != 'true' && ${{ matrix.testgroup }} == 'scanner' env: LONG_TESTS: ${{ steps.git-diff.outputs.value }} run: > pytest --cov --cov-append -n 4 -v --durations=50 test/test_scanner.py - name: Run synchronous tests - if: env.sbom != 'true' && $${{ matrix.testgroup == 'sync` }} + if: env.sbom != 'true' && $${{ matrix.testgroup }} == 'sync env: LONG_TESTS: ${{ steps.git-diff.outputs.value }} run: >