From 7feb9a04fddb2023e41433cebc0778bb2c9c7036 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Tue, 10 Oct 2023 16:08:54 -0700 Subject: [PATCH 01/10] Re-enable kotlin tests Reverts https://github.com/github/codeql-action/pull/1473 --- .github/workflows/__all-platform-bundle.yml | 1 - .github/workflows/__analyze-ref-input.yml | 1 - .github/workflows/__autobuild-action.yml | 1 - .github/workflows/__config-export.yml | 1 - .github/workflows/__diagnostics-export.yml | 1 - .github/workflows/__export-file-baseline-information.yml | 1 - .github/workflows/__extractor-ram-threads.yml | 1 - .github/workflows/__go-custom-queries.yml | 1 - .../__go-indirect-tracing-workaround-diagnostic.yml | 1 - .github/workflows/__go-indirect-tracing-workaround.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/__language-aliases.yml | 1 - .github/workflows/__multi-language-autodetect.yml | 1 - .../workflows/__packaging-codescanning-config-inputs-js.yml | 4 +--- .github/workflows/__packaging-config-inputs-js.yml | 4 +--- .github/workflows/__packaging-config-js.yml | 4 +--- .github/workflows/__packaging-inputs-js.yml | 4 +--- .github/workflows/__remote-config.yml | 1 - .github/workflows/__resolve-environment-action.yml | 4 +--- .github/workflows/__rubocop-multi-language.yml | 1 - .github/workflows/__ruby.yml | 1 - .github/workflows/__scaling-reserved-ram.yml | 1 - .github/workflows/__split-workflow.yml | 1 - .github/workflows/__submit-sarif-failure.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 | 6 +----- .github/workflows/__upload-ref-sha-input.yml | 1 - .github/workflows/__with-checkout-path.yml | 1 - .github/workflows/debug-artifacts-failure.yml | 5 +---- .github/workflows/debug-artifacts.yml | 5 +---- .github/workflows/test-codeql-bundle-all.yml | 5 +---- pr-checks/checks/unset-environment.yml | 4 +--- pr-checks/sync.py | 5 +---- 40 files changed, 11 insertions(+), 68 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index f5bd76bd6..6dffe6317 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -7,7 +7,6 @@ name: PR Check - All-platform bundle env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 6177b7ae4..9ebc17e57 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -7,7 +7,6 @@ name: "PR Check - Analyze: 'ref' and 'sha' from inputs" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index e5c023c64..3c7fc7584 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -7,7 +7,6 @@ name: PR Check - autobuild-action env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index bca5b72cd..c93249327 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -7,7 +7,6 @@ name: PR Check - Config export env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index f53a8ce66..61dfe905d 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -7,7 +7,6 @@ name: PR Check - Diagnostic export env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 6c4b637bf..e6c680f4b 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -7,7 +7,6 @@ name: PR Check - Export file baseline information env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index ce23db921..8a6b737f2 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -7,7 +7,6 @@ name: PR Check - Extractor ram and threads options test env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index cec901492..b31012eaa 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: Custom queries' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index d316c01f1..51405e38c 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: diagnostic when Go is changed after init step' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index 417d2deb4..26ff116b3 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: workaround for indirect tracing' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 4958ca41a..92035638a 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: tracing with autobuilder step' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 8a7507421..cdf949345 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: tracing with custom build steps' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 8d67b966b..df1b8959e 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -7,7 +7,6 @@ name: 'PR Check - Go: tracing with legacy workflow' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index cdfb23f42..accd60d40 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -7,7 +7,6 @@ name: 'PR Check - Packaging: Download using registries' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 81913b222..427313964 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -7,7 +7,6 @@ name: PR Check - Custom source root env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index 442669705..c6a2c7bd0 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -7,7 +7,6 @@ name: PR Check - Language aliases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 1a4d03d20..ecd054e32 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -7,7 +7,6 @@ name: PR Check - Multi-language repository env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 2b62a7f79..259fcc70b 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -7,7 +7,6 @@ name: 'PR Check - Packaging: Config and input passed to the CLI' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -84,8 +83,7 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: - javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index d3a1cd950..e982f8483 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -7,7 +7,6 @@ name: 'PR Check - Packaging: Config and input' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -84,8 +83,7 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: - javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 316d899ee..ad8f4dc90 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -7,7 +7,6 @@ name: 'PR Check - Packaging: Config file' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -83,8 +82,7 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: - javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index e549704fd..bce0f5b1d 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -7,7 +7,6 @@ name: 'PR Check - Packaging: Action input' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -83,8 +82,7 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: - javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index e4869036a..05ff8f593 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -7,7 +7,6 @@ name: PR Check - Remote config file env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index dee884533..eeada6c54 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -7,7 +7,6 @@ name: PR Check - Resolve environment env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -96,8 +95,7 @@ jobs: language: javascript-typescript - name: Fail if JavaScript/TypeScript configuration present - if: matrix.version != 'stable-v2.13.4' && - fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript + if: matrix.version != 'stable-v2.13.4' && fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript run: exit 1 env: CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 7dc0f31f2..faa2b9ab3 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -7,7 +7,6 @@ name: PR Check - RuboCop multi-language env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 359ff243a..5747471e4 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -7,7 +7,6 @@ name: PR Check - Ruby analysis env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index ff6186ef5..728002871 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -7,7 +7,6 @@ name: PR Check - Scaling reserved RAM env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index f7680971c..3257e82cc 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -7,7 +7,6 @@ name: PR Check - Split workflow env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 1fd115c8f..61f9ab2a9 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -7,7 +7,6 @@ name: PR Check - Submit SARIF after failure env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index d805b890e..86447796d 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -7,7 +7,6 @@ name: PR Check - Swift analysis using a custom build command env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index a9ad5b6bf..dabd3bd25 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -7,7 +7,6 @@ name: PR Check - Autobuild working directory env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index d257cda3e..efb3161a4 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -7,7 +7,6 @@ name: PR Check - Local CodeQL bundle env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 20bf9c4e4..bc1827d1f 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -7,7 +7,6 @@ name: PR Check - Proxy test env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 697617e18..bb48fe9a1 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -7,7 +7,6 @@ name: PR Check - Test unsetting environment variables env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -74,10 +73,7 @@ jobs: codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME" - ./build.sh + run: env -i PATH="$PATH" HOME="$HOME" ./build.sh - uses: ./../action/analyze id: analysis with: diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 3de7c5579..4ceb13c02 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -7,7 +7,6 @@ name: "PR Check - Upload-sarif: 'ref' and 'sha' from inputs" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index e15459fdd..5a4aa00f9 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -7,7 +7,6 @@ name: PR Check - Use a custom `checkout_path` env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml index 41cc5e354..f89cad1e1 100644 --- a/.github/workflows/debug-artifacts-failure.yml +++ b/.github/workflows/debug-artifacts-failure.yml @@ -2,9 +2,6 @@ # when the analyze step fails. name: PR Check - Debug artifacts after failure env: - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: push: @@ -52,7 +49,7 @@ jobs: shell: bash run: ./build.sh - uses: ./../action/analyze - id: analysis + id: analysis with: expect-error: true ram: 1 diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 7bee24739..be2dc4fc7 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -1,9 +1,6 @@ # Checks logs, SARIF, and database bundle debug artifacts exist. name: PR Check - Debug artifact upload env: - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: push: @@ -63,7 +60,7 @@ jobs: shell: bash run: ./build.sh - uses: ./../action/analyze - id: analysis + id: analysis download-and-check-artifacts: name: Download and check debug artifacts needs: upload-artifacts diff --git a/.github/workflows/test-codeql-bundle-all.yml b/.github/workflows/test-codeql-bundle-all.yml index 43bab7d24..df2d0159a 100644 --- a/.github/workflows/test-codeql-bundle-all.yml +++ b/.github/workflows/test-codeql-bundle-all.yml @@ -2,9 +2,6 @@ name: 'PR Check - CodeQL Bundle All' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -53,4 +50,4 @@ jobs: with: upload-database: false env: - CODEQL_ACTION_TEST_MODE: true \ No newline at end of file + CODEQL_ACTION_TEST_MODE: true diff --git a/pr-checks/checks/unset-environment.yml b/pr-checks/checks/unset-environment.yml index 2161bfc9d..02eec7d77 100644 --- a/pr-checks/checks/unset-environment.yml +++ b/pr-checks/checks/unset-environment.yml @@ -12,9 +12,7 @@ steps: codeql-path: ${{ steps.init.outputs.codeql-path }} - name: Build code shell: bash - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - run: env -i CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN=true PATH="$PATH" HOME="$HOME" ./build.sh + run: env -i PATH="$PATH" HOME="$HOME" ./build.sh - uses: ./../action/analyze id: analysis with: diff --git a/pr-checks/sync.py b/pr-checks/sync.py index 995705d2a..d57d94a7f 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -134,10 +134,7 @@ def writeHeader(checkStream): 'name': f"PR Check - {checkSpecification['name']}", 'env': { 'GITHUB_TOKEN': '${{ secrets.GITHUB_TOKEN }}', - 'GO111MODULE': 'auto', - # Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a - # workaround for our PR checks. - 'CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN': 'true', + 'GO111MODULE': 'auto' }, 'on': { 'push': { From fcf7c47f2f411ffb2cab9cefb0988c11847db9c1 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 13 Oct 2023 13:05:10 -0700 Subject: [PATCH 02/10] Explicitly setup a kotlin version Change the `prepare-test` action to conditionally setup kotlin. --- .github/actions/prepare-test/action.yml | 9 +++++++++ .github/workflows/__all-platform-bundle.yml | 1 + .github/workflows/__analyze-ref-input.yml | 1 + .github/workflows/__autobuild-action.yml | 1 + .github/workflows/__config-export.yml | 1 + .github/workflows/__diagnostics-export.yml | 1 + .github/workflows/__export-file-baseline-information.yml | 1 + .github/workflows/__extractor-ram-threads.yml | 1 + .github/workflows/__go-custom-queries.yml | 1 + .../__go-indirect-tracing-workaround-diagnostic.yml | 1 + .github/workflows/__go-indirect-tracing-workaround.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/__language-aliases.yml | 1 + .github/workflows/__multi-language-autodetect.yml | 1 + .../__packaging-codescanning-config-inputs-js.yml | 4 +++- .github/workflows/__packaging-config-inputs-js.yml | 4 +++- .github/workflows/__packaging-config-js.yml | 4 +++- .github/workflows/__packaging-inputs-js.yml | 4 +++- .github/workflows/__remote-config.yml | 1 + .github/workflows/__resolve-environment-action.yml | 4 +++- .github/workflows/__rubocop-multi-language.yml | 1 + .github/workflows/__ruby.yml | 1 + .github/workflows/__scaling-reserved-ram.yml | 1 + .github/workflows/__split-workflow.yml | 1 + .github/workflows/__submit-sarif-failure.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 + pr-checks/sync.py | 5 ++++- 37 files changed, 58 insertions(+), 6 deletions(-) diff --git a/.github/actions/prepare-test/action.yml b/.github/actions/prepare-test/action.yml index 2cbe4626e..8f1b7793b 100644 --- a/.github/actions/prepare-test/action.yml +++ b/.github/actions/prepare-test/action.yml @@ -8,6 +8,10 @@ inputs: description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL" default: 'false' required: false + setup-kotlin: + description: "If true, we setup kotlin" + default: 'true' + required: true outputs: tools-url: description: "The value that should be passed as the 'tools' input of the 'init' step." @@ -58,3 +62,8 @@ runs: echo "::error::Unrecognized version specified!" exit 1 fi + + - uses: fwilhe2/setup-kotlin@fa932efcc943c56bfd69ddace2e61129eb495d58 + if: ${{ inputs.setup-kotlin }} == "true" + with: + version: 1.7.21 diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 6dffe6317..4db3d552e 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'true' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 9ebc17e57..f056a0cce 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 3c7fc7584..4b77b741e 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index c93249327..033cd4ce7 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -51,6 +51,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index 61dfe905d..74e06a27f 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -57,6 +57,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index e6c680f4b..e527265d3 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index 8a6b737f2..13d10f5d2 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index b31012eaa..94b6f3f0e 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -87,6 +87,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index 51405e38c..8302a0286 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index 26ff116b3..ef68096ca 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index 92035638a..552fb13f6 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -71,6 +71,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index cdf949345..1389cfc74 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -71,6 +71,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index df1b8959e..b3c4cbd8b 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -71,6 +71,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index accd60d40..b8834a82b 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -58,6 +58,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 427313964..c8b6308e6 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index c6a2c7bd0..39223be8d 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index ecd054e32..427f47362 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -71,6 +71,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 259fcc70b..b3089db60 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -57,6 +57,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( @@ -83,7 +84,8 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: + javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index e982f8483..b70a35e05 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -57,6 +57,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( @@ -83,7 +84,8 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: + javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index ad8f4dc90..c1cd61486 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -57,6 +57,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( @@ -82,7 +83,8 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: + javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index bce0f5b1d..2fa5e0c8d 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -57,6 +57,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( @@ -82,7 +83,8 @@ jobs: uses: ./../action/.github/actions/check-sarif with: sarif-file: ${{ runner.temp }}/results/javascript.sarif - queries-run: javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block + queries-run: + javascript/example/empty-or-one-block,javascript/example/empty-or-one-block,javascript/example/other-query-block,javascript/example/two-block queries-not-run: foo,bar - name: Assert Results diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 05ff8f593..47fc30f10 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -87,6 +87,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index eeada6c54..8ff6de3b5 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -63,6 +63,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( @@ -95,7 +96,8 @@ jobs: language: javascript-typescript - name: Fail if JavaScript/TypeScript configuration present - if: matrix.version != 'stable-v2.13.4' && fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript + if: matrix.version != 'stable-v2.13.4' && + fromJSON(steps.resolve-environment-js.outputs.environment).configuration.javascript run: exit 1 env: CODEQL_ACTION_TEST_MODE: true diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index faa2b9ab3..d2d3b11a7 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 5747471e4..e3cec33dd 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -51,6 +51,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index 728002871..fb1011691 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -71,6 +71,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 3257e82cc..620947c29 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -51,6 +51,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 61f9ab2a9..7da2e7b00 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 86447796d..bc60cdaa6 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -51,6 +51,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index dabd3bd25..3998431d5 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index efb3161a4..e46d7f59e 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index bc1827d1f..5bb2a85e4 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -41,6 +41,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: false - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index bb48fe9a1..5c89187e6 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -55,6 +55,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 4ceb13c02..15404001e 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -45,6 +45,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index 5a4aa00f9..4f0e1c30f 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -87,6 +87,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: true - name: Set environment variable for Swift enablement if: >- runner.os != 'Windows' && ( diff --git a/pr-checks/sync.py b/pr-checks/sync.py index d57d94a7f..300395250 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -80,7 +80,10 @@ def writeHeader(checkStream): 'uses': './.github/actions/prepare-test', 'with': { 'version': '${{ matrix.version }}', - 'use-all-platform-bundle': useAllPlatformBundle + 'use-all-platform-bundle': useAllPlatformBundle, + # If the action is being run from a container, then do not setup kotlin. + # This is because the kotlin binaries cannot be downloaded from the container. + 'setup-kotlin': not 'container' in checkSpecification, } }, # We don't support Swift on Windows or prior versions of the CLI. From a4499778076e12d3ee99d2404db9c42f1f9bdaf6 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 14 Jun 2024 13:40:48 -0700 Subject: [PATCH 03/10] Update setup-kotlin --- .github/actions/prepare-test/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/prepare-test/action.yml b/.github/actions/prepare-test/action.yml index a8838aeef..608b7ec6f 100644 --- a/.github/actions/prepare-test/action.yml +++ b/.github/actions/prepare-test/action.yml @@ -63,7 +63,7 @@ runs: exit 1 fi - - uses: fwilhe2/setup-kotlin@fa932efcc943c56bfd69ddace2e61129eb495d58 + - uses: fwilhe2/setup-kotlin@9c245a6425255f5e98ba1ce6c15d31fce7eca9da if: ${{ inputs.setup-kotlin }} == "true" with: - version: 1.7.21 + version: 1.8.21 From 79f6e84e69c1d4a04ed234095aa5aa07126bc217 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 14 Jun 2024 14:59:22 -0700 Subject: [PATCH 04/10] Ensure string argument instead of boolean --- .github/workflows/__all-platform-bundle.yml | 2 +- .github/workflows/__analyze-ref-input.yml | 2 +- .github/workflows/__autobuild-action.yml | 2 +- .../workflows/__autobuild-direct-tracing-with-working-dir.yml | 2 +- .github/workflows/__autobuild-direct-tracing.yml | 2 +- .github/workflows/__build-mode-autobuild.yml | 2 +- .github/workflows/__build-mode-manual.yml | 2 +- .github/workflows/__build-mode-none.yml | 2 +- .github/workflows/__build-mode-rollback.yml | 2 +- .github/workflows/__cleanup-db-cluster-dir.yml | 2 +- .github/workflows/__config-export.yml | 2 +- .github/workflows/__config-input.yml | 2 +- .github/workflows/__cpp-deptrace-disabled.yml | 2 +- .github/workflows/__cpp-deptrace-enabled-on-macos.yml | 2 +- .github/workflows/__cpp-deptrace-enabled.yml | 2 +- .github/workflows/__diagnostics-export.yml | 2 +- .github/workflows/__export-file-baseline-information.yml | 2 +- .github/workflows/__extractor-ram-threads.yml | 2 +- .github/workflows/__go-custom-queries.yml | 2 +- .../workflows/__go-indirect-tracing-workaround-diagnostic.yml | 2 +- .../__go-indirect-tracing-workaround-no-file-program.yml | 2 +- .github/workflows/__go-indirect-tracing-workaround.yml | 2 +- .github/workflows/__go-tracing-autobuilder.yml | 2 +- .github/workflows/__go-tracing-custom-build-steps.yml | 2 +- .github/workflows/__go-tracing-legacy-workflow.yml | 2 +- .github/workflows/__init-with-registries.yml | 2 +- .github/workflows/__javascript-source-root.yml | 2 +- .github/workflows/__language-aliases.yml | 2 +- .github/workflows/__multi-language-autodetect.yml | 2 +- .../workflows/__packaging-codescanning-config-inputs-js.yml | 2 +- .github/workflows/__packaging-config-inputs-js.yml | 2 +- .github/workflows/__packaging-config-js.yml | 2 +- .github/workflows/__packaging-inputs-js.yml | 2 +- .github/workflows/__remote-config.yml | 2 +- .github/workflows/__resolve-environment-action.yml | 2 +- .github/workflows/__rubocop-multi-language.yml | 2 +- .github/workflows/__ruby.yml | 2 +- .github/workflows/__scaling-reserved-ram.yml | 2 +- .github/workflows/__split-workflow.yml | 2 +- .github/workflows/__submit-sarif-failure.yml | 2 +- .github/workflows/__swift-custom-build.yml | 2 +- .github/workflows/__test-autobuild-working-dir.yml | 2 +- .github/workflows/__test-local-codeql.yml | 2 +- .github/workflows/__test-proxy.yml | 2 +- .github/workflows/__unset-environment.yml | 2 +- .github/workflows/__upload-ref-sha-input.yml | 2 +- .github/workflows/__with-checkout-path.yml | 2 +- pr-checks/sync.py | 4 ++-- 48 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/__all-platform-bundle.yml b/.github/workflows/__all-platform-bundle.yml index 037cd2732..990ea6eda 100644 --- a/.github/workflows/__all-platform-bundle.yml +++ b/.github/workflows/__all-platform-bundle.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'true' - setup-kotlin: true + setup-kotlin: 'true' - id: init uses: ./../action/init with: diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 6429e9f2f..57634f295 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index c62761fa5..e9c4a2d86 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: csharp diff --git a/.github/workflows/__autobuild-direct-tracing-with-working-dir.yml b/.github/workflows/__autobuild-direct-tracing-with-working-dir.yml index d11c179e5..ad297df99 100644 --- a/.github/workflows/__autobuild-direct-tracing-with-working-dir.yml +++ b/.github/workflows/__autobuild-direct-tracing-with-working-dir.yml @@ -62,7 +62,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Test setup shell: bash run: | diff --git a/.github/workflows/__autobuild-direct-tracing.yml b/.github/workflows/__autobuild-direct-tracing.yml index 11dc666c5..88b78a9d8 100644 --- a/.github/workflows/__autobuild-direct-tracing.yml +++ b/.github/workflows/__autobuild-direct-tracing.yml @@ -62,7 +62,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Set up Java test repo configuration shell: bash run: | diff --git a/.github/workflows/__build-mode-autobuild.yml b/.github/workflows/__build-mode-autobuild.yml index a553fb299..d22b8a1f1 100644 --- a/.github/workflows/__build-mode-autobuild.yml +++ b/.github/workflows/__build-mode-autobuild.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Set up Java test repo configuration run: | mv * .github ../action/tests/multi-language-repo/ diff --git a/.github/workflows/__build-mode-manual.yml b/.github/workflows/__build-mode-manual.yml index 48ca5d724..1d309a5f9 100644 --- a/.github/workflows/__build-mode-manual.yml +++ b/.github/workflows/__build-mode-manual.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__build-mode-none.yml b/.github/workflows/__build-mode-none.yml index be76bdcf2..956643d6c 100644 --- a/.github/workflows/__build-mode-none.yml +++ b/.github/workflows/__build-mode-none.yml @@ -58,7 +58,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__build-mode-rollback.yml b/.github/workflows/__build-mode-rollback.yml index f862501fa..cfed618c3 100644 --- a/.github/workflows/__build-mode-rollback.yml +++ b/.github/workflows/__build-mode-rollback.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Set up Java test repo configuration run: | mv * .github ../action/tests/multi-language-repo/ diff --git a/.github/workflows/__cleanup-db-cluster-dir.yml b/.github/workflows/__cleanup-db-cluster-dir.yml index 22126ff0d..ba32b120b 100644 --- a/.github/workflows/__cleanup-db-cluster-dir.yml +++ b/.github/workflows/__cleanup-db-cluster-dir.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Add a file to the database cluster directory run: | mkdir -p "${{ runner.temp }}/customDbLocation/javascript" diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index 6e5e83356..8cdde9dcc 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -66,7 +66,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: javascript diff --git a/.github/workflows/__config-input.yml b/.github/workflows/__config-input.yml index 5e4266583..d5a347f2c 100644 --- a/.github/workflows/__config-input.yml +++ b/.github/workflows/__config-input.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Copy queries into workspace run: | cp -a ../action/queries . diff --git a/.github/workflows/__cpp-deptrace-disabled.yml b/.github/workflows/__cpp-deptrace-disabled.yml index 8eab56511..1dde035ca 100644 --- a/.github/workflows/__cpp-deptrace-disabled.yml +++ b/.github/workflows/__cpp-deptrace-disabled.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Test setup shell: bash run: | diff --git a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml index e60383a06..84b0f49b4 100644 --- a/.github/workflows/__cpp-deptrace-enabled-on-macos.yml +++ b/.github/workflows/__cpp-deptrace-enabled-on-macos.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Test setup shell: bash run: | diff --git a/.github/workflows/__cpp-deptrace-enabled.yml b/.github/workflows/__cpp-deptrace-enabled.yml index a86f633da..0efab3be3 100644 --- a/.github/workflows/__cpp-deptrace-enabled.yml +++ b/.github/workflows/__cpp-deptrace-enabled.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Test setup shell: bash run: | diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index 08a9c03f4..b6ddb9e31 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -72,7 +72,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 4800beec6..582e896e3 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__extractor-ram-threads.yml b/.github/workflows/__extractor-ram-threads.yml index f0da5e18f..266192a4e 100644 --- a/.github/workflows/__extractor-ram-threads.yml +++ b/.github/workflows/__extractor-ram-threads.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: java diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 51ed6ccb6..0500bff73 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -102,7 +102,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: '>=1.21.0' diff --git a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml index 34444994f..8fe384bf3 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: # We need a Go version that ships with statically linked binaries on Linux diff --git a/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml b/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml index d4ab80a00..aae27bd1e 100644 --- a/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml +++ b/.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: # We need a Go version that ships with statically linked binaries on Linux diff --git a/.github/workflows/__go-indirect-tracing-workaround.yml b/.github/workflows/__go-indirect-tracing-workaround.yml index f7c162018..8cf7e9856 100644 --- a/.github/workflows/__go-indirect-tracing-workaround.yml +++ b/.github/workflows/__go-indirect-tracing-workaround.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: # We need a Go version that ships with statically linked binaries on Linux diff --git a/.github/workflows/__go-tracing-autobuilder.yml b/.github/workflows/__go-tracing-autobuilder.yml index d3ab4f067..ad90b3d6c 100644 --- a/.github/workflows/__go-tracing-autobuilder.yml +++ b/.github/workflows/__go-tracing-autobuilder.yml @@ -86,7 +86,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: ~1.22.0 diff --git a/.github/workflows/__go-tracing-custom-build-steps.yml b/.github/workflows/__go-tracing-custom-build-steps.yml index 4b480ae2b..8adca7534 100644 --- a/.github/workflows/__go-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-tracing-custom-build-steps.yml @@ -86,7 +86,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: ~1.22.0 diff --git a/.github/workflows/__go-tracing-legacy-workflow.yml b/.github/workflows/__go-tracing-legacy-workflow.yml index 1d6e58e0d..8539018af 100644 --- a/.github/workflows/__go-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-tracing-legacy-workflow.yml @@ -86,7 +86,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: ~1.22.0 diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index 5eed9ce73..66677a7a3 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -73,7 +73,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Init with registries uses: ./../action/init with: diff --git a/.github/workflows/__javascript-source-root.yml b/.github/workflows/__javascript-source-root.yml index 5eb147f87..370ea1ffb 100644 --- a/.github/workflows/__javascript-source-root.yml +++ b/.github/workflows/__javascript-source-root.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Move codeql-action shell: bash run: | diff --git a/.github/workflows/__language-aliases.yml b/.github/workflows/__language-aliases.yml index 960b791e9..d6b141139 100644 --- a/.github/workflows/__language-aliases.yml +++ b/.github/workflows/__language-aliases.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: C#,java-kotlin,swift,typescript diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index d79e4b174..e2a7cbeb3 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -70,7 +70,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: '>=1.21.0' diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index b57d6b089..04962f9b8 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -72,7 +72,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: config-file: .github/codeql/codeql-config-packaging3.yml diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 8ec691eee..85118a5d1 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -72,7 +72,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: config-file: .github/codeql/codeql-config-packaging3.yml diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 77e30309e..0a398718b 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -72,7 +72,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: config-file: .github/codeql/codeql-config-packaging.yml diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index b01376029..fda1bcc75 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -72,7 +72,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: config-file: .github/codeql/codeql-config-packaging2.yml diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 8c330bab6..e36cdd4e1 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -102,7 +102,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/.github/workflows/__resolve-environment-action.yml b/.github/workflows/__resolve-environment-action.yml index 72627f605..78bc41e93 100644 --- a/.github/workflows/__resolve-environment-action.yml +++ b/.github/workflows/__resolve-environment-action.yml @@ -78,7 +78,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: ${{ matrix.version == 'stable-v2.13.4' && 'go' || 'go,javascript-typescript' diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index 83cbe2ee1..39283d395 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/__ruby.yml b/.github/workflows/__ruby.yml index 772dca4e8..8d16e0e30 100644 --- a/.github/workflows/__ruby.yml +++ b/.github/workflows/__ruby.yml @@ -66,7 +66,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: languages: ruby diff --git a/.github/workflows/__scaling-reserved-ram.yml b/.github/workflows/__scaling-reserved-ram.yml index 4fee36679..a9cf98c34 100644 --- a/.github/workflows/__scaling-reserved-ram.yml +++ b/.github/workflows/__scaling-reserved-ram.yml @@ -70,7 +70,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/setup-go@v5 with: go-version: '>=1.21.0' diff --git a/.github/workflows/__split-workflow.yml b/.github/workflows/__split-workflow.yml index 71966bcc8..53eb3d538 100644 --- a/.github/workflows/__split-workflow.yml +++ b/.github/workflows/__split-workflow.yml @@ -66,7 +66,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: config-file: .github/codeql/codeql-config-packaging3.yml diff --git a/.github/workflows/__submit-sarif-failure.yml b/.github/workflows/__submit-sarif-failure.yml index 0739dfc81..3e3e6b08c 100644 --- a/.github/workflows/__submit-sarif-failure.yml +++ b/.github/workflows/__submit-sarif-failure.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: actions/checkout@v4 - uses: ./init with: diff --git a/.github/workflows/__swift-custom-build.yml b/.github/workflows/__swift-custom-build.yml index 4ff5a9d37..765c33667 100644 --- a/.github/workflows/__swift-custom-build.yml +++ b/.github/workflows/__swift-custom-build.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__test-autobuild-working-dir.yml b/.github/workflows/__test-autobuild-working-dir.yml index 95c9da178..1379ec51b 100644 --- a/.github/workflows/__test-autobuild-working-dir.yml +++ b/.github/workflows/__test-autobuild-working-dir.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Test setup shell: bash run: | diff --git a/.github/workflows/__test-local-codeql.yml b/.github/workflows/__test-local-codeql.yml index 685f4c504..b2148455b 100644 --- a/.github/workflows/__test-local-codeql.yml +++ b/.github/workflows/__test-local-codeql.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Fetch a CodeQL bundle shell: bash env: diff --git a/.github/workflows/__test-proxy.yml b/.github/workflows/__test-proxy.yml index 698671d22..8579f6056 100644 --- a/.github/workflows/__test-proxy.yml +++ b/.github/workflows/__test-proxy.yml @@ -56,7 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: false + setup-kotlin: 'false' - uses: ./../action/init with: languages: javascript diff --git a/.github/workflows/__unset-environment.yml b/.github/workflows/__unset-environment.yml index 9b23ffd00..07275673e 100644 --- a/.github/workflows/__unset-environment.yml +++ b/.github/workflows/__unset-environment.yml @@ -66,7 +66,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init id: init with: diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 409dc3d3b..3cb8e096e 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - uses: ./../action/init with: tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index b97b454fc..492320788 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -60,7 +60,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' - setup-kotlin: true + setup-kotlin: 'true' - name: Delete original checkout shell: bash run: | diff --git a/pr-checks/sync.py b/pr-checks/sync.py index df750a618..6d96bd620 100755 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -72,7 +72,7 @@ def writeHeader(checkStream): 'os': "macos-12", 'version': version }) - else: + else: matrix.append({ 'os': runnerImage, 'version': version @@ -111,7 +111,7 @@ def writeHeader(checkStream): 'use-all-platform-bundle': useAllPlatformBundle, # If the action is being run from a container, then do not setup kotlin. # This is because the kotlin binaries cannot be downloaded from the container. - 'setup-kotlin': not 'container' in checkSpecification, + 'setup-kotlin': str(not 'container' in checkSpecification).lower(), } }, ] From 31a716b48f11bfa30b70b39b28bd4bf498145244 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Fri, 14 Jun 2024 15:08:35 -0700 Subject: [PATCH 05/10] Check setup-kotlin --- .github/actions/prepare-test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/prepare-test/action.yml b/.github/actions/prepare-test/action.yml index 608b7ec6f..ba60471ed 100644 --- a/.github/actions/prepare-test/action.yml +++ b/.github/actions/prepare-test/action.yml @@ -64,6 +64,6 @@ runs: fi - uses: fwilhe2/setup-kotlin@9c245a6425255f5e98ba1ce6c15d31fce7eca9da - if: ${{ inputs.setup-kotlin }} == "true" + if: ${{ inputs.setup-kotlin == 'true' }} with: version: 1.8.21 From eb17dc2c6fefa319cdff36a2a4e466ab29d00e7a Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 17 Jun 2024 12:50:33 +0100 Subject: [PATCH 06/10] Add build mode to Swift autobuild check --- .github/workflows/__swift-autobuild.yml | 2 +- pr-checks/checks/swift-autobuild.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 3fc353cea..895946776 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -61,6 +61,7 @@ jobs: id: init with: languages: swift + build-mode: autobuild tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/.github/actions/setup-swift with: @@ -83,5 +84,4 @@ jobs: exit 1 fi env: - CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: 'true' # Remove when Swift is GA. CODEQL_ACTION_TEST_MODE: true diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml index f0a0cedfa..c7c17c35d 100644 --- a/pr-checks/checks/swift-autobuild.yml +++ b/pr-checks/checks/swift-autobuild.yml @@ -1,16 +1,13 @@ name: "Swift analysis using autobuild" description: "Tests creation of a Swift database using autobuild" -# versions: ["latest", "cached", "nightly-latest"] versions: ["nightly-latest"] -# Swift autobuilder is only supported on MacOS for private beta operatingSystems: ["macos"] -env: - CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA. steps: - uses: ./../action/init id: init with: languages: swift + build-mode: autobuild tools: ${{ steps.prepare-test.outputs.tools-url }} - uses: ./../action/.github/actions/setup-swift with: From 6f86b5da5df1f1115739cc39f86caf69fc466e4f Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 17 Jun 2024 13:02:17 +0100 Subject: [PATCH 07/10] Bump timeout --- .github/workflows/__swift-autobuild.yml | 2 +- pr-checks/checks/swift-autobuild.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 895946776..53622a70b 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -70,7 +70,7 @@ jobs: shell: bash run: pwd - uses: ./../action/autobuild - timeout-minutes: 10 + timeout-minutes: 30 - uses: ./../action/analyze id: analysis with: diff --git a/pr-checks/checks/swift-autobuild.yml b/pr-checks/checks/swift-autobuild.yml index c7c17c35d..9e3a39f34 100644 --- a/pr-checks/checks/swift-autobuild.yml +++ b/pr-checks/checks/swift-autobuild.yml @@ -16,7 +16,7 @@ steps: shell: bash run: pwd - uses: ./../action/autobuild - timeout-minutes: 10 + timeout-minutes: 30 - uses: ./../action/analyze id: analysis with: From de327e8f55652b56a7ebf113a36e59322c971183 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 17 Jun 2024 15:45:17 +0100 Subject: [PATCH 08/10] Remove macOS 11 check and add macOS 14 The macOS 11 runner image is deprecated on Dotcom. --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c9cff72f7..8fefc17e9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -75,7 +75,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-11,macos-12,macos-13] + os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-12,macos-13,macos-14] tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }} runs-on: ${{ matrix.os }} From ec1c05a15fdd64f02411ab7c447456c51622a732 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 17 Jun 2024 16:02:05 +0100 Subject: [PATCH 09/10] Specify a single category We run the same queries across all the OSes so we only need a single category --- .github/workflows/codeql.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8fefc17e9..ef6275ff0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -97,3 +97,5 @@ jobs: run: ${{steps.init.outputs.codeql-path}} version --format=json - name: Perform CodeQL Analysis uses: ./analyze + with: + category: "/language:javascript" From b7574c1c6a9e2ca355c1a8663fc4cef30bfa8894 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Mon, 17 Jun 2024 14:02:59 -0700 Subject: [PATCH 10/10] Fix workflow --- .github/workflows/__swift-autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/__swift-autobuild.yml b/.github/workflows/__swift-autobuild.yml index 3fc353cea..fab7fe6b4 100644 --- a/.github/workflows/__swift-autobuild.yml +++ b/.github/workflows/__swift-autobuild.yml @@ -7,7 +7,6 @@ name: PR Check - Swift analysis using autobuild env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GO111MODULE: auto - CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN: 'true' on: push: branches: @@ -57,6 +56,7 @@ jobs: with: version: ${{ matrix.version }} use-all-platform-bundle: 'false' + setup-kotlin: 'true' - uses: ./../action/init id: init with: