Skip to content

Commit fcf7c47

Browse files
committed
Explicitly setup a kotlin version
Change the `prepare-test` action to conditionally setup kotlin.
1 parent 7feb9a0 commit fcf7c47

37 files changed

+58
-6
lines changed

.github/actions/prepare-test/action.yml

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ inputs:
88
description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL"
99
default: 'false'
1010
required: false
11+
setup-kotlin:
12+
description: "If true, we setup kotlin"
13+
default: 'true'
14+
required: true
1115
outputs:
1216
tools-url:
1317
description: "The value that should be passed as the 'tools' input of the 'init' step."
@@ -58,3 +62,8 @@ runs:
5862
echo "::error::Unrecognized version specified!"
5963
exit 1
6064
fi
65+
66+
- uses: fwilhe2/setup-kotlin@fa932efcc943c56bfd69ddace2e61129eb495d58
67+
if: ${{ inputs.setup-kotlin }} == "true"
68+
with:
69+
version: 1.7.21

.github/workflows/__all-platform-bundle.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__analyze-ref-input.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__autobuild-action.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__config-export.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__diagnostics-export.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__export-file-baseline-information.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__extractor-ram-threads.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-custom-queries.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-indirect-tracing-workaround.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-autobuilder.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-custom-build-steps.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-tracing-legacy-workflow.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__init-with-registries.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__javascript-source-root.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__language-aliases.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__multi-language-autodetect.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__packaging-codescanning-config-inputs-js.yml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__packaging-config-inputs-js.yml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__packaging-config-js.yml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__packaging-inputs-js.yml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__remote-config.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__resolve-environment-action.yml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__rubocop-multi-language.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__ruby.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__scaling-reserved-ram.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__split-workflow.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__submit-sarif-failure.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__swift-custom-build.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__test-autobuild-working-dir.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__test-local-codeql.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__test-proxy.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__unset-environment.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__upload-ref-sha-input.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__with-checkout-path.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pr-checks/sync.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ def writeHeader(checkStream):
8080
'uses': './.github/actions/prepare-test',
8181
'with': {
8282
'version': '${{ matrix.version }}',
83-
'use-all-platform-bundle': useAllPlatformBundle
83+
'use-all-platform-bundle': useAllPlatformBundle,
84+
# If the action is being run from a container, then do not setup kotlin.
85+
# This is because the kotlin binaries cannot be downloaded from the container.
86+
'setup-kotlin': not 'container' in checkSpecification,
8487
}
8588
},
8689
# We don't support Swift on Windows or prior versions of the CLI.

0 commit comments

Comments
 (0)