From 7feb9a04fddb2023e41433cebc0778bb2c9c7036 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Tue, 10 Oct 2023 16:08:54 -0700 Subject: [PATCH 1/5] 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 f5bd76bd6a..6dffe6317d 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 6177b7ae4d..9ebc17e571 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 e5c023c644..3c7fc75845 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 bca5b72cd0..c932493275 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 f53a8ce665..61dfe905dd 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 6c4b637bff..e6c680f4b8 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 ce23db9217..8a6b737f23 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 cec9014927..b31012eaad 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 d316c01f1e..51405e38cf 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 417d2deb40..26ff116b33 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 4958ca41ab..92035638a4 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 8a75074211..cdf9493459 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 8d67b966b5..df1b8959ea 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 cdfb23f427..accd60d404 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 81913b2229..4273139645 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 442669705d..c6a2c7bd05 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 1a4d03d20d..ecd054e325 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 2b62a7f798..259fcc70be 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 d3a1cd9501..e982f84839 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 316d899eee..ad8f4dc90e 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 e549704fdf..bce0f5b1db 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 e4869036a7..05ff8f593a 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 dee884533f..eeada6c54b 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 7dc0f31f2d..faa2b9ab3a 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 359ff243a1..5747471e46 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 ff6186ef5f..728002871f 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 f7680971c4..3257e82cc1 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 1fd115c8f1..61f9ab2a94 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 d805b890e6..86447796d9 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 a9ad5b6bf1..dabd3bd25e 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 d257cda3e2..efb3161a44 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 20bf9c4e4a..bc1827d1f0 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 697617e182..bb48fe9a12 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 3de7c55799..4ceb13c02d 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 e15459fddd..5a4aa00f94 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 41cc5e3546..f89cad1e17 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 7bee247397..be2dc4fc79 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 43bab7d243..df2d0159ac 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 2161bfc9dd..02eec7d775 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 995705d2a8..d57d94a7f6 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 2/5] 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 2cbe4626e9..8f1b7793b4 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 6dffe6317d..4db3d552ef 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 9ebc17e571..f056a0ccec 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 3c7fc75845..4b77b741ec 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 c932493275..033cd4ce73 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 61dfe905dd..74e06a27f3 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 e6c680f4b8..e527265d32 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 8a6b737f23..13d10f5d22 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 b31012eaad..94b6f3f0eb 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 51405e38cf..8302a02867 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 26ff116b33..ef68096ca4 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 92035638a4..552fb13f62 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 cdf9493459..1389cfc74c 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 df1b8959ea..b3c4cbd8b8 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 accd60d404..b8834a82b5 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 4273139645..c8b6308e60 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 c6a2c7bd05..39223be8dc 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 ecd054e325..427f47362b 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 259fcc70be..b3089db60f 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 e982f84839..b70a35e05e 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 ad8f4dc90e..c1cd614869 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 bce0f5b1db..2fa5e0c8dd 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 05ff8f593a..47fc30f104 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 eeada6c54b..8ff6de3b5b 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 faa2b9ab3a..d2d3b11a77 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 5747471e46..e3cec33ddd 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 728002871f..fb1011691d 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 3257e82cc1..620947c296 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 61f9ab2a94..7da2e7b00a 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 86447796d9..bc60cdaa67 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 dabd3bd25e..3998431d5f 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 efb3161a44..e46d7f59e0 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 bc1827d1f0..5bb2a85e49 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 bb48fe9a12..5c89187e60 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 4ceb13c02d..15404001e7 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 5a4aa00f94..4f0e1c30ff 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 d57d94a7f6..3003952505 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 3/5] 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 a8838aeef5..608b7ec6fe 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 4/5] 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 037cd2732f..990ea6edac 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 6429e9f2f1..57634f295a 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 c62761fa5f..e9c4a2d869 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 d11c179e52..ad297df99d 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 11dc666c5f..88b78a9d8d 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 a553fb2991..d22b8a1f1f 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 48ca5d7242..1d309a5f9c 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 be76bdcf27..956643d6c3 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 f862501fa4..cfed618c3a 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 22126ff0d6..ba32b120b8 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 6e5e833567..8cdde9dcc5 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 5e42665838..d5a347f2c5 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 8eab56511c..1dde035cab 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 e60383a06c..84b0f49b42 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 a86f633da8..0efab3be35 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 08a9c03f4c..b6ddb9e310 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 4800beec64..582e896e3c 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 f0da5e18fd..266192a4eb 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 51ed6ccb6c..0500bff736 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 34444994f1..8fe384bf3a 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 d4ab80a00a..aae27bd1e5 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 f7c1620184..8cf7e9856e 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 d3ab4f067a..ad90b3d6cc 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 4b480ae2b3..8adca75346 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 1d6e58e0d6..8539018afb 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 5eed9ce734..66677a7a32 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 5eb147f876..370ea1ffbf 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 960b791e99..d6b1411393 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 d79e4b174f..e2a7cbeb3a 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 b57d6b0894..04962f9b83 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 8ec691eeeb..85118a5d18 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 77e30309e6..0a398718bc 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 b013760295..fda1bcc75b 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 8c330bab6d..e36cdd4e10 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 72627f6051..78bc41e938 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 83cbe2ee14..39283d3952 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 772dca4e86..8d16e0e30e 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 4fee36679d..a9cf98c345 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 71966bcc81..53eb3d5382 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 0739dfc81e..3e3e6b08c0 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 4ff5a9d37e..765c336670 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 95c9da178d..1379ec51b2 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 685f4c5042..b2148455bc 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 698671d22d..8579f6056e 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 9b23ffd00e..07275673e8 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 409dc3d3bb..3cb8e096ec 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 b97b454fca..4923207883 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 df750a618b..6d96bd620c 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 5/5] 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 608b7ec6fe..ba60471ed7 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 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy