From a190d3876ae65eb9ec107d02c7f15629a35c1713 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 16 Nov 2022 16:08:15 +0000 Subject: [PATCH 1/4] Rename `TEST_MODE` to specific variable for CodeQL Action This allows us to set it automatically in the workflow generator, simplifying things and reducing the scope for error. --- .github/query-filter-test/action.yml | 4 ++-- .github/workflows/__analyze-ref-input.yml | 5 +---- .github/workflows/__autobuild-action.yml | 5 +---- .github/workflows/__export-file-baseline-information.yml | 3 +-- .github/workflows/__extractor-ram-threads.yml | 3 +-- .github/workflows/__go-custom-queries.yml | 5 +---- .github/workflows/__go-tracing-autobuilder.yml | 5 +---- .github/workflows/__go-tracing-custom-build-steps.yml | 5 +---- .github/workflows/__go-tracing-legacy-workflow.yml | 5 +---- .github/workflows/__init-with-registries.yml | 3 +-- .github/workflows/__javascript-source-root.yml | 3 +-- .github/workflows/__ml-powered-queries.yml | 5 +---- .github/workflows/__multi-language-autodetect.yml | 5 +---- .../__packaging-codescanning-config-inputs-js.yml | 5 +---- .github/workflows/__packaging-config-inputs-js.yml | 5 +---- .github/workflows/__packaging-config-js.yml | 5 +---- .github/workflows/__packaging-inputs-js.yml | 5 +---- .github/workflows/__remote-config.yml | 5 +---- .github/workflows/__rubocop-multi-language.yml | 3 +-- .github/workflows/__ruby-autodetect.yml | 5 +---- .github/workflows/__ruby.yml | 5 +---- .github/workflows/__split-workflow.yml | 7 +------ .github/workflows/__swift-autobuild.yml | 5 +---- .github/workflows/__swift-custom-build.yml | 5 +---- .github/workflows/__test-autobuild-working-dir.yml | 5 +---- .github/workflows/__test-local-codeql.yml | 5 +---- .github/workflows/__test-proxy.yml | 5 +---- .github/workflows/__unset-environment.yml | 5 +---- .github/workflows/__upload-ref-sha-input.yml | 7 +------ .github/workflows/__with-checkout-path.yml | 7 +------ .github/workflows/debug-artifacts-failure.yml | 6 ++---- .github/workflows/debug-artifacts.yml | 6 ++---- .github/workflows/expected-queries-runs.yml | 6 ++---- .github/workflows/python-deps.yml | 3 +-- lib/shared-environment.js | 4 +++- lib/shared-environment.js.map | 2 +- lib/util.js | 3 ++- lib/util.js.map | 2 +- pr-checks/checks/analyze-ref-input.yml | 4 ---- pr-checks/checks/autobuild-action.yml | 4 ---- pr-checks/checks/export-file-baseline-information.yml | 2 -- pr-checks/checks/extractor-ram-threads.yml | 2 -- pr-checks/checks/go-custom-queries.yml | 4 ---- pr-checks/checks/go-tracing-autobuilder.yml | 4 ---- pr-checks/checks/go-tracing-custom-build-steps.yml | 4 ---- pr-checks/checks/go-tracing-legacy-workflow.yml | 4 ---- pr-checks/checks/init-with-registries.yml | 2 -- pr-checks/checks/javascript-source-root.yml | 2 -- pr-checks/checks/ml-powered-queries.yml | 4 ---- pr-checks/checks/multi-language-autodetect.yml | 4 ---- .../checks/packaging-codescanning-config-inputs-js.yml | 4 ---- pr-checks/checks/packaging-config-inputs-js.yml | 4 ---- pr-checks/checks/packaging-config-js.yml | 4 ---- pr-checks/checks/packaging-inputs-js.yml | 4 ---- pr-checks/checks/remote-config.yml | 4 ---- pr-checks/checks/rubocop-multi-language.yml | 2 -- pr-checks/checks/ruby-autodetect.yml | 4 ---- pr-checks/checks/ruby.yml | 4 ---- pr-checks/checks/split-workflow.yml | 6 ------ pr-checks/checks/swift-autobuild.yml | 4 ---- pr-checks/checks/swift-custom-build.yml | 4 ---- pr-checks/checks/test-autobuild-working-dir.yml | 4 ---- pr-checks/checks/test-local-codeql.yml | 4 ---- pr-checks/checks/test-proxy.yml | 4 ---- pr-checks/checks/unset-environment.yml | 4 ---- pr-checks/checks/upload-ref-sha-input.yml | 6 ------ pr-checks/checks/with-checkout-path.yml | 6 ------ pr-checks/sync.py | 1 + src/shared-environment.ts | 3 +++ src/util.ts | 3 ++- 70 files changed, 51 insertions(+), 245 deletions(-) diff --git a/.github/query-filter-test/action.yml b/.github/query-filter-test/action.yml index d5fa7c1230..33d5401a0f 100644 --- a/.github/query-filter-test/action.yml +++ b/.github/query-filter-test/action.yml @@ -35,14 +35,14 @@ runs: tools: ${{ inputs.tools }} db-location: ${{ runner.temp }}/query-filter-test env: - TEST_MODE: "true" + CODEQL_ACTION_TEST_MODE: "true" - uses: ./../action/analyze with: output: ${{ runner.temp }}/results upload-database: false upload: false env: - TEST_MODE: "true" + CODEQL_ACTION_TEST_MODE: "true" - name: Check SARIF uses: ./../action/.github/check-sarif with: diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 84b99876fe..4138552320 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -83,8 +83,6 @@ jobs: languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -92,7 +90,6 @@ jobs: with: ref: refs/heads/main sha: 5e235361806c361d4d3f8859e3c897658025a9a2 - env: - TEST_MODE: true env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 236a4e17f9..1bcc7a8296 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -46,8 +46,6 @@ jobs: with: languages: csharp tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild env: # Explicitly disable the CLR tracer. @@ -58,8 +56,6 @@ jobs: CORECLR_PROFILER: '' CORECLR_PROFILER_PATH_64: '' - uses: ./../action/analyze - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -70,3 +66,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 5cf8f2e6f6..0a9213f36d 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -49,7 +49,6 @@ jobs: env: CODEQL_FILE_BASELINE_INFORMATION: true CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -59,7 +58,6 @@ jobs: env: CODEQL_FILE_BASELINE_INFORMATION: true CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true - TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3 with: @@ -85,3 +83,4 @@ jobs: done env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 70f0c7d287..d9bb7a0283 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -43,8 +43,6 @@ jobs: languages: java ram: 230 threads: 1 - env: - TEST_MODE: true - name: Assert Results shell: bash run: | @@ -66,3 +64,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 3b4da7b4ed..8d75276132 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -82,14 +82,11 @@ jobs: languages: go config-file: ./.github/codeql/custom-queries.yml tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 0de99293de..027ec853e9 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -69,12 +69,8 @@ jobs: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then @@ -90,3 +86,4 @@ jobs: env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index e9877327d1..2a056ed262 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -69,14 +69,10 @@ jobs: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: go build main.go - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | # Once we start running Bash 4.2 in all environments, we can replace the @@ -94,3 +90,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 77aa3793db..c29cd1539c 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -69,11 +69,7 @@ jobs: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | cd "$RUNNER_TEMP/codeql_databases" @@ -84,3 +80,4 @@ jobs: env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 2d2d778dc6..079ec54c5b 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -54,8 +54,6 @@ jobs: packages: "*/*" token: "${{ secrets.GITHUB_TOKEN }}" - env: - TEST_MODE: true - name: Verify packages installed shell: bash run: | @@ -79,3 +77,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 0386919c90..98dabc9d8a 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -52,8 +52,6 @@ jobs: languages: javascript source-root: ../new-source-root tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze with: skip-queries: true @@ -68,3 +66,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index 5c73023747..d303248c21 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -71,15 +71,11 @@ jobs: queries: security-extended source-root: ./../action/tests/ml-powered-queries-repo tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze with: output: ${{ runner.temp }}/results upload-database: false - env: - TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3 @@ -138,3 +134,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index c990a6ed09..b96c249993 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -69,15 +69,11 @@ jobs: with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - shell: bash run: | CPP_DB=${{ fromJson(steps.analysis.outputs.db-locations).cpp }} @@ -112,3 +108,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: 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 7c5e8af36e..6fd66200ce 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -60,16 +60,12 @@ jobs: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: ${{ runner.temp }}/results - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif @@ -96,3 +92,4 @@ jobs: CODEQL_PASS_CONFIG_TO_CLI: true INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 4e4f20ecbf..6ec41f737f 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -60,16 +60,12 @@ jobs: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: ${{ runner.temp }}/results - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif @@ -94,3 +90,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 560b9edaaf..25a4543f8f 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -59,16 +59,12 @@ jobs: config-file: .github/codeql/codeql-config-packaging.yml languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: ${{ runner.temp }}/results - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif @@ -93,3 +89,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index 4d9d4e4f28..b1f91b5e09 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -60,16 +60,12 @@ jobs: languages: javascript packs: dsp-testing/codeql-pack1@1.0.0, dsp-testing/codeql-pack2, dsp-testing/codeql-pack3:other-query.ql tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: ${{ runner.temp }}/results - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif @@ -94,3 +90,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 948d6bf936..13ebc4ddaa 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -83,13 +83,10 @@ jobs: languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 3d72824c67..9cfda7c255 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -58,7 +58,6 @@ jobs: - uses: ./../action/upload-sarif with: sarif_file: rubocop.sarif - env: - TEST_MODE: true env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ruby-autodetect.yml b/.github/workflows/__ruby-autodetect.yml index a18a78b297..22793581ea 100644 --- a/.github/workflows/__ruby-autodetect.yml +++ b/.github/workflows/__ruby-autodetect.yml @@ -51,12 +51,8 @@ jobs: - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -68,3 +64,4 @@ jobs: env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES: 'true' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 707163f79d..953083cade 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -52,12 +52,8 @@ jobs: with: languages: ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -69,3 +65,4 @@ jobs: env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES: 'true' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index c9b8373b9c..d682947d7a 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -54,8 +54,6 @@ jobs: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -63,8 +61,6 @@ jobs: with: skip-queries: true output: ${{ runner.temp }}/results - env: - TEST_MODE: true - name: Assert No Results shell: bash @@ -77,8 +73,6 @@ jobs: with: output: ${{ runner.temp }}/results upload-database: false - env: - TEST_MODE: true - name: Assert Results shell: bash run: | @@ -95,3 +89,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 4b3a285611..9e71528ad4 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -46,13 +46,9 @@ jobs: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -64,3 +60,4 @@ jobs: env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 2e854ed374..efc8affe71 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -52,15 +52,11 @@ jobs: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -73,3 +69,4 @@ jobs: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 2d5b3f91c3..7a8fb7ac14 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -49,14 +49,10 @@ jobs: with: languages: java tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild with: working-directory: autobuild-dir - uses: ./../action/analyze - env: - TEST_MODE: true - name: Check database shell: bash run: | @@ -67,3 +63,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index 0697311f7d..50758a123a 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -47,13 +47,10 @@ jobs: - uses: ./../action/init with: tools: ./codeql-bundle.tar.gz - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 15f1fa7abb..bd8b6382b4 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -42,14 +42,11 @@ jobs: with: languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze - env: - TEST_MODE: true env: https_proxy: http://squid-proxy:3128 INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true container: image: ubuntu:22.04 options: --dns 127.0.0.1 diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index dcb8b0693c..80ce07bb88 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -57,15 +57,11 @@ jobs: with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: env -i PATH="$PATH" HOME="$HOME" ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - shell: bash run: | CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}" @@ -106,3 +102,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index d9c29bd703..3979ccd7c5 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -83,8 +83,6 @@ jobs: languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -93,13 +91,10 @@ jobs: ref: refs/heads/main sha: 5e235361806c361d4d3f8859e3c897658025a9a2 upload: false - env: - TEST_MODE: true - uses: ./../action/upload-sarif with: ref: refs/heads/main sha: 5e235361806c361d4d3f8859e3c897658025a9a2 - env: - TEST_MODE: true env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 29d9cfbb92..5209dfbde6 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -88,8 +88,6 @@ jobs: languages: csharp,javascript source-path: x/y/z/some-path/tests/multi-language-repo debug: true - env: - TEST_MODE: true - name: Build code (non-windows) shell: bash if: ${{ runner.os != 'Windows' }} @@ -106,16 +104,12 @@ jobs: ref: v1.1.0 sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 upload: false - env: - TEST_MODE: true - uses: ./../action/upload-sarif with: ref: v1.1.0 sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 checkout_path: x/y/z/some-path/tests/multi-language-repo - env: - TEST_MODE: true - name: Verify SARIF after upload shell: bash @@ -147,3 +141,4 @@ jobs: fi env: INTERNAL_CODEQL_ACTION_DEBUG_LOC: true + CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index d265730f2a..cdb9f853be 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -23,6 +23,8 @@ jobs: os: [ubuntu-latest, macos-latest] name: Upload debug artifacts after failure in analyze continue-on-error: true + env: + CODEQL_ACTION_TEST_MODE: true timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: @@ -44,8 +46,6 @@ jobs: debug: true debug-artifact-name: my-debug-artifacts debug-database-name: my-db - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -54,8 +54,6 @@ jobs: with: expect-error: true ram: 1 - env: - TEST_MODE: true download-and-check-artifacts: name: Download and check debug artifacts after failure in analyze needs: upload-artifacts diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 0a65f5d0af..149a3111ff 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -45,6 +45,8 @@ jobs: - os: macos-latest version: nightly-latest name: Upload debug artifacts + env: + CODEQL_ACTION_TEST_MODE: true timeout-minutes: 45 runs-on: ${{ matrix.os }} steps: @@ -64,15 +66,11 @@ jobs: debug: true debug-artifact-name: my-debug-artifacts debug-database-name: my-db - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true download-and-check-artifacts: name: Download and check debug artifacts needs: upload-artifacts diff --git a/.github/workflows/expected-queries-runs.yml b/.github/workflows/expected-queries-runs.yml index 96527272ed..d74e90acbf 100644 --- a/.github/workflows/expected-queries-runs.yml +++ b/.github/workflows/expected-queries-runs.yml @@ -17,6 +17,8 @@ on: jobs: expected-queries: name: Expected Queries Tests + env: + CODEQL_ACTION_TEST_MODE: true timeout-minutes: 45 runs-on: ubuntu-latest steps: @@ -31,15 +33,11 @@ jobs: with: languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze with: output: ${{ runner.temp }}/results upload-database: false upload: false - env: - TEST_MODE: true - name: Check Sarif uses: ./../action/.github/check-sarif diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index eeb6d88ead..49acccc578 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -148,6 +148,7 @@ jobs: python_deps_type: pipenv env: + CODEQL_ACTION_TEST_MODE: true PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }} PYTHON_VERSION: ${{ matrix.python_version }} @@ -165,8 +166,6 @@ jobs: tools: latest languages: python setup-python-dependencies: false - env: - TEST_MODE: true - name: Test Auto Package Installation run: | diff --git a/lib/shared-environment.js b/lib/shared-environment.js index 0cbb61681b..b26b6a8593 100644 --- a/lib/shared-environment.js +++ b/lib/shared-environment.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.CODEQL_ACTION_TESTING_ENVIRONMENT = exports.CODEQL_WORKFLOW_STARTED_AT = exports.ODASA_TRACER_CONFIGURATION = void 0; +exports.CODEQL_ACTION_TEST_MODE = exports.CODEQL_ACTION_TESTING_ENVIRONMENT = exports.CODEQL_WORKFLOW_STARTED_AT = exports.ODASA_TRACER_CONFIGURATION = void 0; exports.ODASA_TRACER_CONFIGURATION = "ODASA_TRACER_CONFIGURATION"; // The time at which the first action (normally init) started executing. // If a workflow invokes a different action without first invoking the init @@ -9,4 +9,6 @@ exports.ODASA_TRACER_CONFIGURATION = "ODASA_TRACER_CONFIGURATION"; // rather that the init action. exports.CODEQL_WORKFLOW_STARTED_AT = "CODEQL_WORKFLOW_STARTED_AT"; exports.CODEQL_ACTION_TESTING_ENVIRONMENT = "CODEQL_ACTION_TESTING_ENVIRONMENT"; +/** Used to disable uploading SARIF results or status reports to the GitHub API */ +exports.CODEQL_ACTION_TEST_MODE = "CODEQL_ACTION_TEST_MODE"; //# sourceMappingURL=shared-environment.js.map \ No newline at end of file diff --git a/lib/shared-environment.js.map b/lib/shared-environment.js.map index bf2878e051..430d1ac072 100644 --- a/lib/shared-environment.js.map +++ b/lib/shared-environment.js.map @@ -1 +1 @@ -{"version":3,"file":"shared-environment.js","sourceRoot":"","sources":["../src/shared-environment.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,wEAAwE;AACxE,2EAA2E;AAC3E,4EAA4E;AAC5E,2EAA2E;AAC3E,+BAA+B;AAClB,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAE1D,QAAA,iCAAiC,GAC5C,mCAAmC,CAAC"} \ No newline at end of file +{"version":3,"file":"shared-environment.js","sourceRoot":"","sources":["../src/shared-environment.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,wEAAwE;AACxE,2EAA2E;AAC3E,4EAA4E;AAC5E,2EAA2E;AAC3E,+BAA+B;AAClB,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAE1D,QAAA,iCAAiC,GAC5C,mCAAmC,CAAC;AAEtC,kFAAkF;AACrE,QAAA,uBAAuB,GAAG,yBAAyB,CAAC"} \ No newline at end of file diff --git a/lib/util.js b/lib/util.js index d08ec96568..7dd7623bf6 100644 --- a/lib/util.js +++ b/lib/util.js @@ -37,6 +37,7 @@ const apiCompatibility = __importStar(require("./api-compatibility.json")); const codeql_1 = require("./codeql"); const config_utils_1 = require("./config-utils"); const feature_flags_1 = require("./feature-flags"); +const shared_environment_1 = require("./shared-environment"); /** * Specifies bundle versions that are known to be broken * and will not be used if found in the toolcache. @@ -557,7 +558,7 @@ exports.checkActionVersion = checkActionVersion; * In test mode, we don't upload SARIF results or status reports to the GitHub API. */ function isInTestMode() { - return process.env["TEST_MODE"] === "true"; + return process.env[shared_environment_1.CODEQL_ACTION_TEST_MODE] === "true"; } exports.isInTestMode = isInTestMode; /** diff --git a/lib/util.js.map b/lib/util.js.map index c27cb98c7e..821d3ce1cd 100644 --- a/lib/util.js.map +++ b/lib/util.js.map @@ -1 +1 @@ -{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;AAC7B,+BAAiC;AAEjC,oDAAsC;AACtC,8CAAsB;AACtB,sEAA4C;AAC5C,+CAAiC;AAEjC,kDAAoC;AACpC,6CAA8D;AAC9D,2EAA6D;AAC7D,qCAA8D;AAC9D,iDAIwB;AACxB,mDAA6D;AAI7D;;;GAGG;AACH,MAAM,eAAe,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAE3C;;GAEG;AACU,QAAA,iBAAiB,GAAG,oBAAoB,CAAC;AAEtD;;GAEG;AACU,QAAA,2BAA2B,GAAG,iBAAiB,CAAC;AAE7D;;GAEG;AACU,QAAA,2BAA2B,GAAG,IAAI,CAAC;AAEhD;;;GAGG;AACU,QAAA,6BAA6B,GACxC,oCAAoC,CAAC;AAyCvC;;GAEG;AACH,SAAgB,uBAAuB;IACrC,MAAM,OAAO,GAAG,6BAA6B,CAAC;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACzC,OAAO,EAAE,CAAC;KACX;IACD,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,IAAI,KAAK,CACb,GAAG,OAAO,kEAAkE,OAAO,EAAE,CACtF,CAAC;KACH;AACH,CAAC;AAdD,0DAcC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,KAAgB;IAC3C,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QACjC,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7D,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;SAC/B;KACF;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChC,CAAC;AAZD,oCAYC;AAED,6FAA6F;AAC7F,wCAAwC;AACjC,KAAK,UAAU,UAAU,CAC9B,IAAoC;IAEpC,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,IAAA,aAAG,EAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC;AAChB,CAAC;AAPD,gCAOC;AAED;;;;;;GAMG;AACH,SAAS,gCAAgC;IACvC,8CAA8C;IAC9C,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,SAA6B;IAC9D,IAAI,oBAA4B,CAAC;IACjC,IAAI,SAAS,EAAE;QACb,oBAAoB,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI,oBAAoB,IAAI,CAAC,EAAE;YACnE,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,eAAe,CAAC,CAAC;SACnE;KACF;SAAM;QACL,MAAM,gBAAgB,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QACvC,MAAM,oBAAoB,GAAG,gBAAgB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;QAC9D,MAAM,uBAAuB,GAAG,gCAAgC,EAAE,CAAC;QACnE,oBAAoB,GAAG,oBAAoB,GAAG,uBAAuB,CAAC;KACvE;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAC1C,CAAC;AAdD,gDAcC;AAED;;;;;;GAMG;AACH,SAAgB,aAAa,CAAC,SAA6B;IACzD,OAAO,SAAS,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;AAClD,CAAC;AAFD,sCAEC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAChC,SAAuC;IAEvC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;QACjC,sEAAsE;QACtE,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;KAChD;IACD,OAAO,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,yBAAyB,CAAC;AACxE,CAAC;AARD,gDAQC;AAED;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CACjC,SAA6B,EAC7B,MAAc;IAEd,IAAI,UAAkB,CAAC;IACvB,MAAM,UAAU,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;IACpC,IAAI,SAAS,EAAE;QACb,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/B,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,eAAe,CAAC,CAAC;SACvE;QACD,IAAI,UAAU,GAAG,UAAU,EAAE;YAC3B,MAAM,CAAC,IAAI,CACT,uCAAuC,UAAU,uBAAuB,UAAU,IAAI,CACvF,CAAC;YACF,UAAU,GAAG,UAAU,CAAC;SACzB;QACD,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC;QAC/B,IAAI,UAAU,GAAG,UAAU,EAAE;YAC3B,MAAM,CAAC,IAAI,CACT,4CAA4C,UAAU,uBAAuB,UAAU,IAAI,CAC5F,CAAC;YACF,UAAU,GAAG,UAAU,CAAC;SACzB;KACF;SAAM;QACL,+BAA+B;QAC/B,UAAU,GAAG,UAAU,CAAC;KACzB;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AA7BD,kDA6BC;AAED;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC5B,SAA6B,EAC7B,MAAc;IAEd,OAAO,aAAa,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;AAC/D,CAAC;AALD,wCAKC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,MAAc,EAAE,QAAkB;IACtE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC;AAFD,sDAEC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAgB;IAC7C,MAAM,WAAW,GAAG,QAAQ,CAAC;IAC7B,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;QAClC,QAAQ,GAAG,WAAW,QAAQ,EAAE,CAAC;KAClC;IACD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACvE,MAAM,IAAI,KAAK,CAAC,IAAI,WAAW,8BAA8B,CAAC,CAAC;KAChE;IAED,IAAI,GAAQ,CAAC;IACb,IAAI;QACF,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;KACzB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,IAAI,WAAW,sBAAsB,CAAC,CAAC;KACxD;IAED,kDAAkD;IAClD,0CAA0C;IAC1C,IAAI,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,EAAE;QACtE,OAAO,yBAAiB,CAAC;KAC1B;IAED,wCAAwC;IACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;KAC3E;IACD,4CAA4C;IAC5C,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACnC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1C;IAED,4DAA4D;IAC5D,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC/B,GAAG,CAAC,QAAQ,GAAG,GAAG,GAAG,CAAC,QAAQ,GAAG,CAAC;KACnC;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AArCD,wCAqCC;AAED,MAAM,gCAAgC,GAAG,6BAA6B,CAAC;AACvE,MAAM,0CAA0C,GAC9C,oCAAoC,CAAC;AAEvC,IAAI,yBAAyB,GAAG,KAAK,CAAC;AAEtC,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,qDAAM,CAAA;IACN,iDAAI,CAAA;IACJ,iDAAI,CAAA;AACN,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAMM,KAAK,UAAU,gBAAgB,CACpC,UAA4B;IAE5B,iEAAiE;IACjE,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,yBAAiB,EAAE;QACxD,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;KACvC;IAED,8DAA8D;IAC9D,mEAAmE;IACnE,MAAM,SAAS,GAAG,IAAA,yBAAY,GAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IAE5C,8EAA8E;IAC9E,wEAAwE;IACxE,IAAI,QAAQ,CAAC,OAAO,CAAC,gCAAgC,CAAC,KAAK,SAAS,EAAE;QACpE,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;KACvC;IAED,IAAI,QAAQ,CAAC,OAAO,CAAC,gCAAgC,CAAC,KAAK,WAAW,EAAE;QACtE,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC;KACrC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,gCAAgC,CAAW,CAAC;IAC7E,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;AAC/C,CAAC;AAzBD,4CAyBC;AAED,SAAgB,yBAAyB,CACvC,OAAsB,EACtB,MAAc;IAEd,IAAI,yBAAyB,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,EAAE;QACpE,OAAO;KACR;IAED,MAAM,0BAA0B,GAAG,iBAAiB,CAClD,OAAO,CAAC,OAAO,EACf,gBAAgB,CAAC,cAAc,EAC/B,gBAAgB,CAAC,cAAc,CAChC,CAAC;IAEF,IACE,0BAA0B,KAAK,0BAA0B,CAAC,cAAc,EACxE;QACA,MAAM,CAAC,OAAO,CACZ,8FAA8F,OAAO,CAAC,OAAO,2FAA2F,CACzM,CAAC;KACH;IACD,IACE,0BAA0B,KAAK,0BAA0B,CAAC,cAAc,EACxE;QACA,MAAM,CAAC,OAAO,CACZ,qBAAqB,OAAO,CAAC,OAAO,2MAA2M,CAChP,CAAC;KACH;IACD,yBAAyB,GAAG,IAAI,CAAC;IACjC,IAAI,CAAC,cAAc,CAAC,0CAA0C,EAAE,IAAI,CAAC,CAAC;AACxE,CAAC;AA9BD,8DA8BC;AAED,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,+FAAc,CAAA;IACd,+FAAc,CAAA;AAChB,CAAC,EAHW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAGrC;AAED,SAAgB,iBAAiB,CAC/B,OAAe,EACf,cAAsB,EACtB,cAAsB;IAEtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,cAAc,EAAE,CAAC,EAAE;QACrD,OAAO,0BAA0B,CAAC,cAAc,CAAC;KAClD;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,cAAc,EAAE,CAAC,EAAE;QACrD,OAAO,0BAA0B,CAAC,cAAc,CAAC;KAClD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAZD,8CAYC;AAED;;GAEG;AACH,MAAM,yBAA0B,SAAQ,KAAK;IAC3C,YAAmB,uBAA8B;QAC/C,KAAK,CAAC,+CAA+C,CAAC,CAAC;QADtC,4BAAuB,GAAvB,uBAAuB,CAAO;IAEjD,CAAC;CACF;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,KAAY;IACtC,MAAM,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AAFD,kCAEC;AAED;;;GAGG;AACH,IAAY,MA8BX;AA9BD,WAAY,MAAM;IAChB;;OAEG;IACH,2CAAiC,CAAA;IAEjC;;;OAGG;IACH,uEAA6D,CAAA;IAE7D;;;OAGG;IACH,mEAAyD,CAAA;IAEzD;;;;OAIG;IACH,yEAA+D,CAAA;IAE/D;;;OAGG;IACH,6DAAmD,CAAA;AACrD,CAAC,EA9BW,MAAM,GAAN,cAAM,KAAN,cAAM,QA8BjB;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,OAAe;IACnD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC;AAJD,sDAIC;AAED;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CAAC,MAAc;IACpD,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,mCAA0B,CAAC,EAAE;QAChE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;KACvD;SAAM;QACL,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;KACtD;AACH,CAAC;AARD,8CAQC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,SAAiB;IACnD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,mCAAmC,CAAC,CAAC;KAClE;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,kDAMC;AAED,MAAa,SAAU,SAAQ,KAAK;IAGlC,YAAY,OAAe,EAAE,MAAc;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAPD,8BAOC;AAED;;;GAGG;AACH,MAAa,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;CACF;AAJD,8BAIC;AAED,SAAgB,WAAW,CAAC,GAAQ;IAClC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,MAAK,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACnE,CAAC;AAFD,kCAEC;AAED,IAAI,mBAAmB,GAAuB,SAAS,CAAC;AAExD,SAAgB,kBAAkB,CAAC,OAAe;IAChD,IAAI,mBAAmB,KAAK,SAAS,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;IACD,mBAAmB,GAAG,OAAO,CAAC;AAChC,CAAC;AALD,gDAKC;AAED,SAAgB,sBAAsB;IACpC,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAFD,wDAEC;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,eAAuB;IAEvB,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,eAAe,CAAC,CAAC;AAChE,CAAC;AALD,gDAKC;AAED,gEAAgE;AACzD,KAAK,UAAU,QAAQ,CAC5B,MAAc,EACd,QAAkB,EAClB,MAAc,EACd,MAAc;IAEd,MAAM,YAAY,GAAG,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,CAAC;IAC5E,gEAAgE;IAChE,qEAAqE;IACrE,sEAAsE;IACtE,oEAAoE;IACpE,qBAAqB;IACrB,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QACrC,MAAM,IAAA,aAAG,EAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;KAChD;IACD,MAAM,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACtE,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAlBD,4BAkBC;AAEM,KAAK,UAAU,KAAK,CAAC,YAAoB;IAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;AACrE,CAAC;AAFD,sBAEC;AAED,SAAgB,aAAa,CAAC,WAAmB;IAC/C,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAChD,CAAC;AAFD,sCAEC;AAEY,QAAA,+BAA+B,GAC1C,4CAA4C,CAAC;AAE/C;;;GAGG;AACI,KAAK,UAAU,yBAAyB,CAC7C,MAAc;IAEd,IAAI,OAAO,CAAC;IACZ,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;QAC9C,OAAO,GAAG,QAAQ,CAAC;KACpB;SAAM,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;QACpD,OAAO,GAAG,QAAQ,CAAC;KACpB;SAAM,IAAI,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;QACpD,OAAO,GAAG,QAAQ,CAAC;KACpB;SAAM;QACL,OAAO,GAAG,QAAQ,CAAC;KACpB;IACD,OAAO,IAAA,8BAAe,EAAC;QACrB,IAAI,EAAE,uCAA+B;QACrC,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAjBD,8DAiBC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,2BAA2B,CAAC,MAAc;IACxD,MAAM,qBAAqB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,sCAAuB,EAAC,CAAC,CAAC,CAAC;SACtC,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,4CAA4C,IAAI,CAAC,IAAI,CAAC,IAAI,CAC3E,CAAC;IACJ,QAAQ,qBAAqB,CAAC,MAAM,EAAE;QACpC,KAAK,CAAC;YACJ,sFAAsF;YACtF,6FAA6F;YAC7F,uFAAuF;YACvF,6FAA6F;YAC7F,iBAAiB;YACjB,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,QAAQ,CAAC;QACtD,KAAK,CAAC;YACJ,OAAO,OAAO,CAAC;QACjB;YACE,OAAO,OAAO,CAAC;KAClB;AACH,CAAC;AApBD,kEAoBC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,kBAAkB,CAAC,OAAe;;IACtD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;QACrC,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACnD,4FAA4F;QAC5F,EAAE;QACF,8FAA8F;QAC9F,+FAA+F;QAC/F,kCAAkC;QAClC,IACE,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,MAAM;YAC3C,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI;YACzC,CAAC,aAAa,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI;gBACxC,MAAM,CAAC,SAAS,CACd,MAAA,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,mCAAI,OAAO,EAC/C,OAAO,CACR,CAAC,EACJ;YACA,IAAI,CAAC,OAAO,CACV,uFAAuF;gBACrF,wBAAwB;gBACxB,yFAAyF,CAC5F,CAAC;SACH;KACF;AACH,CAAC;AAxBD,gDAwBC;AAED;;;;GAIG;AACH,SAAgB,YAAY;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC;AAC7C,CAAC;AAFD,oCAEC;AAED;;;GAGG;AACI,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,iBAAoC;IAEpC,OAAO,MAAM,iBAAiB,CAAC,QAAQ,CAAC,uBAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;AAChF,CAAC;AALD,gEAKC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,MAAc,EACd,iBAAoC,EACpC,MAAc;IAEd,IAAI,MAAM,0BAA0B,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;QAC/D,MAAM,CAAC,IAAI,CACT,qEAAqE,CACtE,CAAC;KACH;SAAM;QACL,MAAM,CAAC,IAAI,CACT,wEAAwE,CACzE,CAAC;KACH;AACH,CAAC;AAdD,gEAcC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAe;IAChD,IAAI;QACF,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAPD,gDAOC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,GAAW;IACpC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE;QAC5B,OAAO,EAAE,CAAC;KACX;IACD,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,IAAI,KAAK,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;QAC3B,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3C;aAAM,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YAC9B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjE;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAdD,gCAcC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,MAAc;IAEd,IAAI;QACF,OAAO,MAAM,IAAA,gBAAS,EAAiB,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC;KACjE;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,OAAO,CAAC,sDAAsD,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAVD,8CAUC;AAED,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB;;;;;;;;;;;;;;;;;;;GAmBG;AACI,KAAK,UAAU,WAAW,CAC/B,SAAiB,EACjB,OAAmB,EACnB,SAAqB;IAErB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;QAC7B,QAAQ,GAAG,IAAI,CAAC;QAChB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,OAAO,GAAuB,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1D,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,QAAQ,EAAE;gBACb,sEAAsE;gBACtE,sEAAsE;gBACtE,qEAAqE;gBACrE,mEAAmE;gBACnE,UAAU,GAAG,IAAI,CAAC;gBAClB,SAAS,EAAE,CAAC;aACb;YACD,OAAO,CAAC,SAAS,CAAC,CAAC;QACrB,CAAC,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;AACnD,CAAC;AA1BD,kCA0BC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe;IACnC,IAAI,UAAU,KAAK,IAAI,EAAE;QACvB,IAAI,CAAC,IAAI,CACP,oFAAoF,CACrF,CAAC;QACF,MAAM,KAAK,CAAC,KAAM,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC;AARD,0CAQC;AAED;;;;;;;;;GASG;AACH,SAAgB,cAAc;;IAC5B,OAAO;IACL,+CAA+C;IAC/C,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,0CAAE,QAAQ,CAAC,cAAc,CAAC;;QACpD,6CAA6C;QAC7C,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,0CAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA;;QACtD,8DAA8D;QAC9D,MAAA,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,0CAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAA,CAC9D,CAAC;AACJ,CAAC;AATD,wCASC"} \ No newline at end of file +{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/pr-checks/checks/analyze-ref-input.yml b/pr-checks/checks/analyze-ref-input.yml index e6b18e9b02..7948c3d5da 100644 --- a/pr-checks/checks/analyze-ref-input.yml +++ b/pr-checks/checks/analyze-ref-input.yml @@ -6,8 +6,6 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -15,5 +13,3 @@ steps: with: ref: 'refs/heads/main' sha: '5e235361806c361d4d3f8859e3c897658025a9a2' - env: - TEST_MODE: true diff --git a/pr-checks/checks/autobuild-action.yml b/pr-checks/checks/autobuild-action.yml index 09f5e68255..c219e41fe3 100644 --- a/pr-checks/checks/autobuild-action.yml +++ b/pr-checks/checks/autobuild-action.yml @@ -6,8 +6,6 @@ steps: with: languages: csharp tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild env: # Explicitly disable the CLR tracer. @@ -18,8 +16,6 @@ steps: CORECLR_PROFILER: "" CORECLR_PROFILER_PATH_64: "" - uses: ./../action/analyze - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index b890d259d0..4ce7d7fbfd 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -9,7 +9,6 @@ steps: env: CODEQL_FILE_BASELINE_INFORMATION: true CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -19,7 +18,6 @@ steps: env: CODEQL_FILE_BASELINE_INFORMATION: true CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: true - TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3 with: diff --git a/pr-checks/checks/extractor-ram-threads.yml b/pr-checks/checks/extractor-ram-threads.yml index 29b605dc8a..996d8b4bde 100644 --- a/pr-checks/checks/extractor-ram-threads.yml +++ b/pr-checks/checks/extractor-ram-threads.yml @@ -8,8 +8,6 @@ steps: languages: java ram: 230 threads: 1 - env: - TEST_MODE: true - name: Assert Results shell: bash run: | diff --git a/pr-checks/checks/go-custom-queries.yml b/pr-checks/checks/go-custom-queries.yml index 20261adc3f..518c51a9f1 100644 --- a/pr-checks/checks/go-custom-queries.yml +++ b/pr-checks/checks/go-custom-queries.yml @@ -8,11 +8,7 @@ steps: languages: go config-file: ./.github/codeql/custom-queries.yml tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true diff --git a/pr-checks/checks/go-tracing-autobuilder.yml b/pr-checks/checks/go-tracing-autobuilder.yml index 7ea1d7e263..4c01f02d62 100644 --- a/pr-checks/checks/go-tracing-autobuilder.yml +++ b/pr-checks/checks/go-tracing-autobuilder.yml @@ -8,12 +8,8 @@ steps: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | if [[ "${CODEQL_ACTION_DID_AUTOBUILD_GOLANG}" != true ]]; then diff --git a/pr-checks/checks/go-tracing-custom-build-steps.yml b/pr-checks/checks/go-tracing-custom-build-steps.yml index 361fa31ce9..1490717694 100644 --- a/pr-checks/checks/go-tracing-custom-build-steps.yml +++ b/pr-checks/checks/go-tracing-custom-build-steps.yml @@ -6,14 +6,10 @@ steps: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: go build main.go - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | # Once we start running Bash 4.2 in all environments, we can replace the diff --git a/pr-checks/checks/go-tracing-legacy-workflow.yml b/pr-checks/checks/go-tracing-legacy-workflow.yml index 0c82542304..010d425f55 100644 --- a/pr-checks/checks/go-tracing-legacy-workflow.yml +++ b/pr-checks/checks/go-tracing-legacy-workflow.yml @@ -8,11 +8,7 @@ steps: with: languages: go tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze - env: - TEST_MODE: true - shell: bash run: | cd "$RUNNER_TEMP/codeql_databases" diff --git a/pr-checks/checks/init-with-registries.yml b/pr-checks/checks/init-with-registries.yml index 6c475d2b57..6ab1a53dfe 100644 --- a/pr-checks/checks/init-with-registries.yml +++ b/pr-checks/checks/init-with-registries.yml @@ -19,8 +19,6 @@ steps: packages: "*/*" token: "${{ secrets.GITHUB_TOKEN }}" - env: - TEST_MODE: true - name: Verify packages installed shell: bash run: | diff --git a/pr-checks/checks/javascript-source-root.yml b/pr-checks/checks/javascript-source-root.yml index 7b30cb5a19..ed85a604d1 100644 --- a/pr-checks/checks/javascript-source-root.yml +++ b/pr-checks/checks/javascript-source-root.yml @@ -13,8 +13,6 @@ steps: languages: javascript source-root: ../new-source-root tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze with: skip-queries: true diff --git a/pr-checks/checks/ml-powered-queries.yml b/pr-checks/checks/ml-powered-queries.yml index 2f06b8c16d..0e439b4080 100644 --- a/pr-checks/checks/ml-powered-queries.yml +++ b/pr-checks/checks/ml-powered-queries.yml @@ -14,15 +14,11 @@ steps: queries: security-extended source-root: ./../action/tests/ml-powered-queries-repo tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze with: output: "${{ runner.temp }}/results" upload-database: false - env: - TEST_MODE: true - name: Upload SARIF uses: actions/upload-artifact@v3 diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index 69e5091a7b..2dcb112de0 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -6,15 +6,11 @@ steps: with: db-location: "${{ runner.temp }}/customDbLocation" tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - shell: bash run: | CPP_DB=${{ fromJson(steps.analysis.outputs.db-locations).cpp }} diff --git a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml index 50353ee51a..94f42cb7b5 100644 --- a/pr-checks/checks/packaging-codescanning-config-inputs-js.yml +++ b/pr-checks/checks/packaging-codescanning-config-inputs-js.yml @@ -12,16 +12,12 @@ steps: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: "${{ runner.temp }}/results" - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif diff --git a/pr-checks/checks/packaging-config-inputs-js.yml b/pr-checks/checks/packaging-config-inputs-js.yml index edbeb44420..56d9344ec3 100644 --- a/pr-checks/checks/packaging-config-inputs-js.yml +++ b/pr-checks/checks/packaging-config-inputs-js.yml @@ -8,16 +8,12 @@ steps: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: "${{ runner.temp }}/results" - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif diff --git a/pr-checks/checks/packaging-config-js.yml b/pr-checks/checks/packaging-config-js.yml index 3108d45cb6..40334228bc 100644 --- a/pr-checks/checks/packaging-config-js.yml +++ b/pr-checks/checks/packaging-config-js.yml @@ -7,16 +7,12 @@ steps: config-file: ".github/codeql/codeql-config-packaging.yml" languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: "${{ runner.temp }}/results" - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif diff --git a/pr-checks/checks/packaging-inputs-js.yml b/pr-checks/checks/packaging-inputs-js.yml index eb8b17088c..6a254bd967 100644 --- a/pr-checks/checks/packaging-inputs-js.yml +++ b/pr-checks/checks/packaging-inputs-js.yml @@ -8,16 +8,12 @@ steps: languages: javascript packs: dsp-testing/codeql-pack1@1.0.0, dsp-testing/codeql-pack2, dsp-testing/codeql-pack3:other-query.ql tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze with: output: "${{ runner.temp }}/results" - env: - TEST_MODE: true - name: Check results uses: ./../action/.github/check-sarif diff --git a/pr-checks/checks/remote-config.yml b/pr-checks/checks/remote-config.yml index 351eaa4b87..918c1cd0da 100644 --- a/pr-checks/checks/remote-config.yml +++ b/pr-checks/checks/remote-config.yml @@ -6,11 +6,7 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true diff --git a/pr-checks/checks/rubocop-multi-language.yml b/pr-checks/checks/rubocop-multi-language.yml index 504b1d3b4d..3d4f62915b 100644 --- a/pr-checks/checks/rubocop-multi-language.yml +++ b/pr-checks/checks/rubocop-multi-language.yml @@ -24,5 +24,3 @@ steps: - uses: ./../action/upload-sarif with: sarif_file: rubocop.sarif - env: - TEST_MODE: true diff --git a/pr-checks/checks/ruby-autodetect.yml b/pr-checks/checks/ruby-autodetect.yml index ea00b89aec..daad374af3 100644 --- a/pr-checks/checks/ruby-autodetect.yml +++ b/pr-checks/checks/ruby-autodetect.yml @@ -10,12 +10,8 @@ steps: - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/ruby.yml b/pr-checks/checks/ruby.yml index 3273240909..32b492f55b 100644 --- a/pr-checks/checks/ruby.yml +++ b/pr-checks/checks/ruby.yml @@ -9,12 +9,8 @@ steps: with: languages: ruby tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/split-workflow.yml b/pr-checks/checks/split-workflow.yml index 9bea010f0a..6e802c22fb 100644 --- a/pr-checks/checks/split-workflow.yml +++ b/pr-checks/checks/split-workflow.yml @@ -9,8 +9,6 @@ steps: packs: +dsp-testing/codeql-pack1@1.0.0 languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -18,8 +16,6 @@ steps: with: skip-queries: true output: "${{ runner.temp }}/results" - env: - TEST_MODE: true - name: Assert No Results shell: bash @@ -32,8 +28,6 @@ steps: with: output: "${{ runner.temp }}/results" upload-database: false - env: - TEST_MODE: true - name: Assert Results shell: bash run: | diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml index 330a37c73e..df36ea9909 100644 --- a/pr-checks/checks/swift-autobuild.yml +++ b/pr-checks/checks/swift-autobuild.yml @@ -10,13 +10,9 @@ steps: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/swift-custom-build.yml b/pr-checks/checks/swift-custom-build.yml index 065733a713..3b2e3e889c 100644 --- a/pr-checks/checks/swift-custom-build.yml +++ b/pr-checks/checks/swift-custom-build.yml @@ -10,15 +10,11 @@ steps: with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/test-autobuild-working-dir.yml b/pr-checks/checks/test-autobuild-working-dir.yml index 6f8aa0a58e..3d3a8b8406 100644 --- a/pr-checks/checks/test-autobuild-working-dir.yml +++ b/pr-checks/checks/test-autobuild-working-dir.yml @@ -14,14 +14,10 @@ steps: with: languages: java tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/autobuild with: working-directory: autobuild-dir - uses: ./../action/analyze - env: - TEST_MODE: true - name: Check database shell: bash run: | diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml index ce36df45ce..3a7edc9813 100644 --- a/pr-checks/checks/test-local-codeql.yml +++ b/pr-checks/checks/test-local-codeql.yml @@ -12,11 +12,7 @@ steps: - uses: ./../action/init with: tools: ./codeql-bundle.tar.gz - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh - uses: ./../action/analyze - env: - TEST_MODE: true diff --git a/pr-checks/checks/test-proxy.yml b/pr-checks/checks/test-proxy.yml index ca68e41cf0..fd0d4f98bf 100644 --- a/pr-checks/checks/test-proxy.yml +++ b/pr-checks/checks/test-proxy.yml @@ -17,8 +17,4 @@ steps: with: languages: javascript tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - uses: ./../action/analyze - env: - TEST_MODE: true diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml index 14174c40c1..777bc40424 100644 --- a/pr-checks/checks/unset-environment.yml +++ b/pr-checks/checks/unset-environment.yml @@ -6,15 +6,11 @@ steps: with: db-location: ${{ runner.temp }}/customDbLocation tools: ${{ steps.prepare-test.outputs.tools-url }} - env: - TEST_MODE: true - name: Build code shell: bash run: env -i PATH="$PATH" HOME="$HOME" ./build.sh - uses: ./../action/analyze id: analysis - env: - TEST_MODE: true - shell: bash run: | CPP_DB="${{ fromJson(steps.analysis.outputs.db-locations).cpp }}" diff --git a/pr-checks/checks/upload-ref-sha-input.yml b/pr-checks/checks/upload-ref-sha-input.yml index 508a6a4412..2f8fe2ad32 100644 --- a/pr-checks/checks/upload-ref-sha-input.yml +++ b/pr-checks/checks/upload-ref-sha-input.yml @@ -6,8 +6,6 @@ steps: tools: ${{ steps.prepare-test.outputs.tools-url }} languages: cpp,csharp,java,javascript,python config-file: ${{ github.repository }}/tests/multi-language-repo/.github/codeql/custom-queries.yml@${{ github.sha }} - env: - TEST_MODE: true - name: Build code shell: bash run: ./build.sh @@ -16,11 +14,7 @@ steps: ref: 'refs/heads/main' sha: '5e235361806c361d4d3f8859e3c897658025a9a2' upload: false - env: - TEST_MODE: true - uses: ./../action/upload-sarif with: ref: 'refs/heads/main' sha: '5e235361806c361d4d3f8859e3c897658025a9a2' - env: - TEST_MODE: true diff --git a/pr-checks/checks/with-checkout-path.yml b/pr-checks/checks/with-checkout-path.yml index 84bddda78d..23805b3b7e 100644 --- a/pr-checks/checks/with-checkout-path.yml +++ b/pr-checks/checks/with-checkout-path.yml @@ -14,8 +14,6 @@ steps: languages: csharp,javascript source-path: x/y/z/some-path/tests/multi-language-repo debug: true - env: - TEST_MODE: true - name: Build code (non-windows) shell: bash if: ${{ runner.os != 'Windows' }} @@ -32,16 +30,12 @@ steps: ref: v1.1.0 sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 upload: false - env: - TEST_MODE: true - uses: ./../action/upload-sarif with: ref: v1.1.0 sha: 474bbf07f9247ffe1856c6a0f94aeeb10e7afee6 checkout_path: x/y/z/some-path/tests/multi-language-repo - env: - TEST_MODE: true - name: Verify SARIF after upload shell: bash diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 19189d3ac7..fb1d788e4f 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -116,6 +116,7 @@ def writeHeader(checkStream): checkJob['env'] = checkJob.get('env', {}) checkJob['env']['INTERNAL_CODEQL_ACTION_DEBUG_LOC'] = True + checkJob['env']['CODEQL_ACTION_TEST_MODE'] = True checkName = file[:len(file) - 4] with open(f"../.github/workflows/__{checkName}.yml", 'w') as output_stream: diff --git a/src/shared-environment.ts b/src/shared-environment.ts index 063f8ba35f..6545c51a85 100644 --- a/src/shared-environment.ts +++ b/src/shared-environment.ts @@ -8,3 +8,6 @@ export const CODEQL_WORKFLOW_STARTED_AT = "CODEQL_WORKFLOW_STARTED_AT"; export const CODEQL_ACTION_TESTING_ENVIRONMENT = "CODEQL_ACTION_TESTING_ENVIRONMENT"; + +/** Used to disable uploading SARIF results or status reports to the GitHub API */ +export const CODEQL_ACTION_TEST_MODE = "CODEQL_ACTION_TEST_MODE"; diff --git a/src/util.ts b/src/util.ts index 3381257882..f958e77ffd 100644 --- a/src/util.ts +++ b/src/util.ts @@ -20,6 +20,7 @@ import { import { Feature, FeatureEnablement } from "./feature-flags"; import { Language } from "./languages"; import { Logger } from "./logging"; +import { CODEQL_ACTION_TEST_MODE } from "./shared-environment"; /** * Specifies bundle versions that are known to be broken @@ -664,7 +665,7 @@ export async function checkActionVersion(version: string) { * In test mode, we don't upload SARIF results or status reports to the GitHub API. */ export function isInTestMode(): boolean { - return process.env["TEST_MODE"] === "true"; + return process.env[CODEQL_ACTION_TEST_MODE] === "true"; } /** From 7cdf75141e826d3cf5ca2a78532a2c9897ee2815 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 16 Nov 2022 16:08:33 +0000 Subject: [PATCH 2/4] Remove redundant `INTERNAL_CODEQL_ACTION_DEBUG_LOC` variable --- .github/workflows/__analyze-ref-input.yml | 1 - .github/workflows/__autobuild-action.yml | 1 - .github/workflows/__export-file-baseline-information.yml | 1 - .github/workflows/__extractor-ram-threads.yml | 1 - .github/workflows/__go-custom-queries.yml | 1 - .github/workflows/__go-tracing-autobuilder.yml | 1 - .github/workflows/__go-tracing-custom-build-steps.yml | 1 - .github/workflows/__go-tracing-legacy-workflow.yml | 1 - .github/workflows/__init-with-registries.yml | 1 - .github/workflows/__javascript-source-root.yml | 1 - .github/workflows/__ml-powered-queries.yml | 1 - .github/workflows/__multi-language-autodetect.yml | 1 - .github/workflows/__packaging-codescanning-config-inputs-js.yml | 1 - .github/workflows/__packaging-config-inputs-js.yml | 1 - .github/workflows/__packaging-config-js.yml | 1 - .github/workflows/__packaging-inputs-js.yml | 1 - .github/workflows/__remote-config.yml | 1 - .github/workflows/__rubocop-multi-language.yml | 1 - .github/workflows/__ruby-autodetect.yml | 1 - .github/workflows/__ruby.yml | 1 - .github/workflows/__split-workflow.yml | 1 - .github/workflows/__swift-autobuild.yml | 1 - .github/workflows/__swift-custom-build.yml | 1 - .github/workflows/__test-autobuild-working-dir.yml | 1 - .github/workflows/__test-local-codeql.yml | 1 - .github/workflows/__test-proxy.yml | 1 - .github/workflows/__unset-environment.yml | 1 - .github/workflows/__upload-ref-sha-input.yml | 1 - .github/workflows/__with-checkout-path.yml | 1 - .github/workflows/debug-artifacts-failure.yml | 1 - .github/workflows/debug-artifacts.yml | 1 - pr-checks/sync.py | 1 - 32 files changed, 32 deletions(-) diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 4138552320..1c27da3fc5 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -91,5 +91,4 @@ jobs: ref: refs/heads/main sha: 5e235361806c361d4d3f8859e3c897658025a9a2 env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 1bcc7a8296..807df26c47 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -65,5 +65,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 0a9213f36d..e5981ea521 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -82,5 +82,4 @@ jobs: fi done env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index d9bb7a0283..8a3ca5a28a 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -63,5 +63,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 8d75276132..ebbdf5239d 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -88,5 +88,4 @@ jobs: - uses: ./../action/analyze env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 027ec853e9..a491c478d8 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -85,5 +85,4 @@ jobs: fi env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 2a056ed262..b6e8055bbb 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -89,5 +89,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index c29cd1539c..e06ea36d73 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -79,5 +79,4 @@ jobs: fi env: DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 079ec54c5b..958fca7dee 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -76,5 +76,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 98dabc9d8a..c32a27cbea 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -65,5 +65,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml index d303248c21..6441e8e9d9 100644 --- a/.github/workflows/__ml-powered-queries.yml +++ b/.github/workflows/__ml-powered-queries.yml @@ -133,5 +133,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index b96c249993..7a3ddab379 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -107,5 +107,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: 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 6fd66200ce..d3657a2025 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -91,5 +91,4 @@ jobs: env: CODEQL_PASS_CONFIG_TO_CLI: true - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 6ec41f737f..f35e2a9af7 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -89,5 +89,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 25a4543f8f..7751c8f137 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -88,5 +88,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index b1f91b5e09..77be551100 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -89,5 +89,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 13ebc4ddaa..30c9348e22 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -88,5 +88,4 @@ jobs: run: ./build.sh - uses: ./../action/analyze env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 9cfda7c255..c240aabb73 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -59,5 +59,4 @@ jobs: with: sarif_file: rubocop.sarif env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ruby-autodetect.yml b/.github/workflows/__ruby-autodetect.yml index 22793581ea..3895159c65 100644 --- a/.github/workflows/__ruby-autodetect.yml +++ b/.github/workflows/__ruby-autodetect.yml @@ -63,5 +63,4 @@ jobs: fi env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES: 'true' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 953083cade..7c12669a72 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -64,5 +64,4 @@ jobs: fi env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES: 'true' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index d682947d7a..d2d45353b9 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -88,5 +88,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 9e71528ad4..8df545be37 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -59,5 +59,4 @@ jobs: fi env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index efc8affe71..83a0b84ffa 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -68,5 +68,4 @@ jobs: env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' DOTNET_GENERATE_ASPNET_CERTIFICATE: 'false' - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 7a8fb7ac14..0ab8a2b7a9 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -62,5 +62,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index 50758a123a..54354b4ebd 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -52,5 +52,4 @@ jobs: run: ./build.sh - uses: ./../action/analyze env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index bd8b6382b4..1551a18a9b 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -45,7 +45,6 @@ jobs: - uses: ./../action/analyze env: https_proxy: http://squid-proxy:3128 - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true container: image: ubuntu:22.04 diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 80ce07bb88..dfdf0a01c6 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -101,5 +101,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 3979ccd7c5..a488455b4e 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -96,5 +96,4 @@ jobs: ref: refs/heads/main sha: 5e235361806c361d4d3f8859e3c897658025a9a2 env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 5209dfbde6..dd63cb05df 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -140,5 +140,4 @@ jobs: exit 1 fi env: - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index cdb9f853be..9afb2b30ef 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -89,4 +89,3 @@ jobs: done env: GO111MODULE: auto - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 149a3111ff..99cc887fed 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -115,4 +115,3 @@ jobs: done env: GO111MODULE: auto - INTERNAL_CODEQL_ACTION_DEBUG_LOC: true \ No newline at end of file diff --git a/pr-checks/sync.py b/pr-checks/sync.py index fb1d788e4f..bd23bdf414 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -115,7 +115,6 @@ def writeHeader(checkStream): checkJob[key] = checkSpecification[key] checkJob['env'] = checkJob.get('env', {}) - checkJob['env']['INTERNAL_CODEQL_ACTION_DEBUG_LOC'] = True checkJob['env']['CODEQL_ACTION_TEST_MODE'] = True checkName = file[:len(file) - 4] From ffc2dd6d6dd78d70b6f6d0ecbcc3fbbd073924e4 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 16 Nov 2022 16:18:08 +0000 Subject: [PATCH 3/4] Enable test mode for `check-codescanning-config` Action --- .github/check-codescanning-config/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/check-codescanning-config/action.yml b/.github/check-codescanning-config/action.yml index c966b49cfe..4f878bf5af 100644 --- a/.github/check-codescanning-config/action.yml +++ b/.github/check-codescanning-config/action.yml @@ -42,6 +42,8 @@ runs: packs: ${{ inputs.packs }} tools: ${{ inputs.tools }} db-location: ${{ runner.temp }}/codescanning-config-cli-test + env: + CODEQL_ACTION_TEST_MODE: 'true' - name: Install dependencies shell: bash From a836d9571f6687e891564c1c95386137fccb74b4 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 16 Nov 2022 16:18:15 +0000 Subject: [PATCH 4/4] Set testing environment for CodeQL workflow --- .github/workflows/codeql.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bc22fc10b6..3981d43bc8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -9,6 +9,9 @@ on: # by other workflows. types: [opened, synchronize, reopened, ready_for_review] +env: + CODEQL_ACTION_TESTING_ENVIRONMENT: codeql-action-pr-checks + jobs: # Identify the CodeQL tool versions to use in the analysis job. check-codeql-versions: