From d7437a2202142d374eba5c6ce3626e2ebd8458df Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Thu, 4 Jan 2024 16:41:50 +0000 Subject: [PATCH] Remove deprecated `CODEQL_PASS_CONFIG_TO_CLI` env var from PR checks --- .github/workflows/__config-export.yml | 1 - .../__packaging-codescanning-config-inputs-js.yml | 2 -- .github/workflows/codescanning-config-cli.yml | 13 ------------- pr-checks/checks/config-export.yml | 2 -- .../packaging-codescanning-config-inputs-js.yml | 4 ---- 5 files changed, 22 deletions(-) diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index d6ba56e99..c6eaaf5ec 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -112,5 +112,4 @@ jobs: } core.info('Finished config export tests.'); env: - CODEQL_PASS_CONFIG_TO_CLI: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 137101b3e..07f16ab32 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -113,6 +113,4 @@ jobs: exit 1 fi env: - CODEQL_PASS_CONFIG_TO_CLI: true - CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/codescanning-config-cli.yml b/.github/workflows/codescanning-config-cli.yml index bde425f22..37e174635 100644 --- a/.github/workflows/codescanning-config-cli.yml +++ b/.github/workflows/codescanning-config-cli.yml @@ -3,7 +3,6 @@ name: Code-Scanning config CLI tests env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CODEQL_PASS_CONFIG_TO_CLI: true on: push: @@ -204,15 +203,3 @@ jobs: packs: + codeql/javascript-queries config-file-test: .github/codeql/other-config-properties.yml tools: ${{ steps.prepare-test.outputs.tools-url }} - - - name: Config not generated when env var is not set - if: success() || failure() - env: - CODEQL_PASS_CONFIG_TO_CLI: false - uses: ./../action/.github/actions/check-codescanning-config - with: - expected-config-file-contents: "" - languages: javascript - packs: + codeql/javascript-queries - config-file-test: .github/codeql/other-config-properties.yml - tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/pr-checks/checks/config-export.yml b/pr-checks/checks/config-export.yml index 26f1378d3..1915921ab 100644 --- a/pr-checks/checks/config-export.yml +++ b/pr-checks/checks/config-export.yml @@ -1,8 +1,6 @@ name: "Config export" description: "Tests that the code scanning configuration file is exported to SARIF correctly." versions: ["latest", "nightly-latest"] -env: - CODEQL_PASS_CONFIG_TO_CLI: true steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml index ccfed3133..039108cd8 100644 --- a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml +++ b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml @@ -1,10 +1,6 @@ name: "Packaging: Config and input passed to the CLI" description: "Checks that specifying packages using a combination of a config file and input to the Action works" versions: ["latest", "default", "nightly-latest"] # This feature is not compatible with old CLIs - -env: - CODEQL_PASS_CONFIG_TO_CLI: true - steps: - uses: ./../action/init with: