Explicitly setup a kotlin version

Change the `prepare-test` action to conditionally setup kotlin.
This commit is contained in:
Andrew Eisenberg 2023-10-13 13:05:10 -07:00
parent 7feb9a04fd
commit fcf7c47f2f
37 changed files with 58 additions and 6 deletions

View file

@ -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

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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' && (

View file

@ -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

View file

@ -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' && (

1
.github/workflows/__ruby.yml generated vendored
View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

1
.github/workflows/__test-proxy.yml generated vendored
View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -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' && (

View file

@ -80,7 +80,10 @@ for file in os.listdir('checks'):
'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.