Merge remote-tracking branch 'upstream/main' into aeisenberg/enable-kotlin-tests
This commit is contained in:
commit
3f41e06a52
964 changed files with 33911 additions and 44091 deletions
|
|
@ -1,26 +1,28 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import ruamel.yaml
|
||||
from ruamel.yaml.scalarstring import FoldedScalarString
|
||||
from ruamel.yaml.scalarstring import FoldedScalarString, SingleQuotedScalarString
|
||||
import pathlib
|
||||
import textwrap
|
||||
|
||||
# The default set of CodeQL Bundle versions to use for the PR checks.
|
||||
defaultTestVersions = [
|
||||
# The oldest supported CodeQL version: 2.11.6. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts`
|
||||
"stable-20221211",
|
||||
# The last CodeQL release in the 2.12 series: 2.12.7.
|
||||
"stable-20230418",
|
||||
# The oldest supported CodeQL version: 2.12.6. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts`
|
||||
"stable-20230403",
|
||||
# The last CodeQL release in the 2.13 series: 2.13.5.
|
||||
"stable-v2.13.5",
|
||||
# The last CodeQL release in the 2.14 series: 2.14.6.
|
||||
"stable-v2.14.6",
|
||||
# The last CodeQL release in the 2.15 series: 2.15.5.
|
||||
"stable-v2.15.5",
|
||||
# The last CodeQL release in the 2.16 series: 2.16.6.
|
||||
"stable-v2.16.6",
|
||||
# The default version of CodeQL for Dotcom, as determined by feature flags.
|
||||
"default",
|
||||
# The version of CodeQL shipped with the Action in `defaults.json`. During the release process
|
||||
# for a new CodeQL release, there will be a period of time during which this will be newer than
|
||||
# the default version on Dotcom.
|
||||
"latest",
|
||||
"linked",
|
||||
# A nightly build directly from the our private repo, built in the last 24 hours.
|
||||
"nightly-latest"
|
||||
]
|
||||
|
|
@ -46,6 +48,7 @@ def writeHeader(checkStream):
|
|||
|
||||
yaml = ruamel.yaml.YAML()
|
||||
yaml.Representer = NonAliasingRTRepresenter
|
||||
yaml.indent(mapping=2, sequence=4, offset=2)
|
||||
|
||||
this_dir = pathlib.Path(__file__).resolve().parent
|
||||
|
||||
|
|
@ -62,10 +65,18 @@ for file in (this_dir / 'checks').glob('*.yml'):
|
|||
if image.startswith(operatingSystem)]
|
||||
|
||||
for runnerImage in runnerImages:
|
||||
matrix.append({
|
||||
'os': runnerImage,
|
||||
'version': version
|
||||
})
|
||||
# Prior to CLI v2.15.1, ARM runners were not supported by the build tracer.
|
||||
# "macos-latest" is now an ARM runner, so we run tests on the old CLIs on Intel runners instead.
|
||||
if version in ["stable-20230403", "stable-v2.13.4", "stable-v2.13.5", "stable-v2.14.6"] and runnerImage == "macos-latest":
|
||||
matrix.append({
|
||||
'os': "macos-12",
|
||||
'version': version
|
||||
})
|
||||
else:
|
||||
matrix.append({
|
||||
'os': runnerImage,
|
||||
'version': version
|
||||
})
|
||||
|
||||
useAllPlatformBundle = "false" # Default to false
|
||||
if checkSpecification.get('useAllPlatformBundle'):
|
||||
|
|
@ -78,9 +89,8 @@ for file in (this_dir / 'checks').glob('*.yml'):
|
|||
# Ensure that this is serialized as a folded (`>`) string to preserve the readability
|
||||
# of the generated workflow.
|
||||
'if': FoldedScalarString(textwrap.dedent('''
|
||||
matrix.os == 'macos-latest' && (
|
||||
matrix.version == 'stable-20221211' ||
|
||||
matrix.version == 'stable-20230418' ||
|
||||
runner.os == 'macOS' && (
|
||||
matrix.version == 'stable-20230403' ||
|
||||
matrix.version == 'stable-v2.13.5' ||
|
||||
matrix.version == 'stable-v2.14.6')
|
||||
''').strip()),
|
||||
|
|
@ -104,19 +114,13 @@ for file in (this_dir / 'checks').glob('*.yml'):
|
|||
'setup-kotlin': not 'container' in checkSpecification,
|
||||
}
|
||||
},
|
||||
# We don't support Swift on Windows or prior versions of the CLI.
|
||||
{
|
||||
'name': 'Set environment variable for Swift enablement',
|
||||
'if': "runner.os != 'Windows' && matrix.version == '20221211'",
|
||||
'shell': 'bash',
|
||||
'run': 'echo "CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT=true" >> $GITHUB_ENV'
|
||||
},
|
||||
]
|
||||
|
||||
steps.extend(checkSpecification['steps'])
|
||||
|
||||
checkJob = {
|
||||
'strategy': {
|
||||
'fail-fast': False,
|
||||
'matrix': {
|
||||
'include': matrix
|
||||
}
|
||||
|
|
@ -157,6 +161,7 @@ for file in (this_dir / 'checks').glob('*.yml'):
|
|||
'pull_request': {
|
||||
'types': ["opened", "synchronize", "reopened", "ready_for_review"]
|
||||
},
|
||||
'schedule': [{'cron': SingleQuotedScalarString('0 5 * * *')}],
|
||||
'workflow_dispatch': {}
|
||||
},
|
||||
'jobs': {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue