diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 668629a916..9c4bf8e5ef 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: "Analyze: 'ref' and 'sha' from inputs" timeout-minutes: 45 diff --git a/.github/workflows/__autobuild-action.yml b/.github/workflows/__autobuild-action.yml index 3c440c7dfb..236a4e17f9 100644 --- a/.github/workflows/__autobuild-action.yml +++ b/.github/workflows/__autobuild-action.yml @@ -29,9 +29,7 @@ jobs: version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest name: autobuild-action timeout-minutes: 45 diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 3ed0cf9d1e..23334160bb 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Go: Custom queries' timeout-minutes: 45 diff --git a/.github/workflows/__go-custom-tracing-autobuild.yml b/.github/workflows/__go-custom-tracing-autobuild.yml index 4ab1218cec..e163fdf034 100644 --- a/.github/workflows/__go-custom-tracing-autobuild.yml +++ b/.github/workflows/__go-custom-tracing-autobuild.yml @@ -25,15 +25,15 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 diff --git a/.github/workflows/__go-custom-tracing.yml b/.github/workflows/__go-custom-tracing.yml index 74ed3fb888..df1b709b08 100644 --- a/.github/workflows/__go-custom-tracing.yml +++ b/.github/workflows/__go-custom-tracing.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Go: Custom tracing' timeout-minutes: 45 diff --git a/.github/workflows/__go-reconciled-tracing-autobuilder.yml b/.github/workflows/__go-reconciled-tracing-autobuilder.yml index 4d4a6427ee..18efc2cff3 100644 --- a/.github/workflows/__go-reconciled-tracing-autobuilder.yml +++ b/.github/workflows/__go-reconciled-tracing-autobuilder.yml @@ -25,15 +25,15 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 diff --git a/.github/workflows/__go-reconciled-tracing-custom-build-steps.yml b/.github/workflows/__go-reconciled-tracing-custom-build-steps.yml index c86b7e9e40..6ea8f2c3df 100644 --- a/.github/workflows/__go-reconciled-tracing-custom-build-steps.yml +++ b/.github/workflows/__go-reconciled-tracing-custom-build-steps.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Go: Reconciled tracing with custom build steps' timeout-minutes: 45 diff --git a/.github/workflows/__go-reconciled-tracing-legacy-workflow.yml b/.github/workflows/__go-reconciled-tracing-legacy-workflow.yml index 709a57edf0..f52714efca 100644 --- a/.github/workflows/__go-reconciled-tracing-legacy-workflow.yml +++ b/.github/workflows/__go-reconciled-tracing-legacy-workflow.yml @@ -25,15 +25,15 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 diff --git a/.github/workflows/__init-with-registries.yml b/.github/workflows/__init-with-registries.yml index ff2e13a815..2d2d778dc6 100644 --- a/.github/workflows/__init-with-registries.yml +++ b/.github/workflows/__init-with-registries.yml @@ -29,9 +29,7 @@ jobs: version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Packaging: Download using registries' timeout-minutes: 45 diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml index 9f6fc2fa96..e7378f4b17 100644 --- a/.github/workflows/__multi-language-autodetect.yml +++ b/.github/workflows/__multi-language-autodetect.yml @@ -25,15 +25,15 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 diff --git a/.github/workflows/__packaging-codescanning-config-inputs-js.yml b/.github/workflows/__packaging-codescanning-config-inputs-js.yml index 2ffa8125f2..7c5e8af36e 100644 --- a/.github/workflows/__packaging-codescanning-config-inputs-js.yml +++ b/.github/workflows/__packaging-codescanning-config-inputs-js.yml @@ -29,23 +29,19 @@ jobs: version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Packaging: Config and input passed to the CLI' timeout-minutes: 45 diff --git a/.github/workflows/__packaging-config-inputs-js.yml b/.github/workflows/__packaging-config-inputs-js.yml index 83ab1f16d6..4e4f20ecbf 100644 --- a/.github/workflows/__packaging-config-inputs-js.yml +++ b/.github/workflows/__packaging-config-inputs-js.yml @@ -29,23 +29,19 @@ jobs: version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Packaging: Config and input' timeout-minutes: 45 diff --git a/.github/workflows/__packaging-config-js.yml b/.github/workflows/__packaging-config-js.yml index 0f29a6cafd..560b9edaaf 100644 --- a/.github/workflows/__packaging-config-js.yml +++ b/.github/workflows/__packaging-config-js.yml @@ -29,23 +29,19 @@ jobs: version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Packaging: Config file' timeout-minutes: 45 diff --git a/.github/workflows/__packaging-inputs-js.yml b/.github/workflows/__packaging-inputs-js.yml index de762cb512..4d9d4e4f28 100644 --- a/.github/workflows/__packaging-inputs-js.yml +++ b/.github/workflows/__packaging-inputs-js.yml @@ -29,23 +29,19 @@ jobs: version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: 'Packaging: Action input' timeout-minutes: 45 diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 8b2f23523d..15fec5a514 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: Remote config file timeout-minutes: 45 diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index dc12bb20ec..3d72824c67 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -25,18 +25,8 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest - version: stable-20210308 - - os: ubuntu-latest - version: stable-20210319 - - os: ubuntu-latest - version: stable-20210809 - os: ubuntu-latest version: cached - - os: ubuntu-latest - version: latest - - os: ubuntu-latest - version: nightly-latest name: RuboCop multi-language timeout-minutes: 45 runs-on: ${{ matrix.os }} diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 3f4211983b..91a6b528c0 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: "Upload-sarif: 'ref' and 'sha' from inputs" timeout-minutes: 45 diff --git a/.github/workflows/__with-checkout-path.yml b/.github/workflows/__with-checkout-path.yml index ec8d57c9b1..b679c2da9a 100644 --- a/.github/workflows/__with-checkout-path.yml +++ b/.github/workflows/__with-checkout-path.yml @@ -25,19 +25,19 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - os: macos-latest version: stable-20210308 - os: windows-2019 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 - os: macos-latest version: stable-20210319 - os: windows-2019 version: stable-20210319 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: macos-latest version: stable-20210809 @@ -47,23 +47,19 @@ jobs: version: cached - os: macos-latest version: cached - - os: windows-2019 + - os: windows-latest version: cached - os: ubuntu-latest version: latest - os: macos-latest version: latest - - os: windows-2019 - version: latest - - os: windows-2022 + - os: windows-latest version: latest - os: ubuntu-latest version: nightly-latest - os: macos-latest version: nightly-latest - - os: windows-2019 - version: nightly-latest - - os: windows-2022 + - os: windows-latest version: nightly-latest name: Use a custom `checkout_path` timeout-minutes: 45 diff --git a/.github/workflows/codescanning-config-cli.yml b/.github/workflows/codescanning-config-cli.yml index c0f93b96bb..4cf405f022 100644 --- a/.github/workflows/codescanning-config-cli.yml +++ b/.github/workflows/codescanning-config-cli.yml @@ -24,7 +24,6 @@ jobs: continue-on-error: true strategy: - fail-fast: true matrix: include: - os: ubuntu-latest diff --git a/.github/workflows/debug-artifacts.yml b/.github/workflows/debug-artifacts.yml index 24c77acb2a..bef01c453e 100644 --- a/.github/workflows/debug-artifacts.yml +++ b/.github/workflows/debug-artifacts.yml @@ -19,8 +19,31 @@ jobs: upload-artifacts: strategy: matrix: - os: [ubuntu-latest, macos-latest] - version: [stable-20210308, stable-20210319, stable-20210809, cached, latest, nightly-latest] + include: + - os: ubuntu-20.04 + version: stable-20210308 + - os: macos-latest + version: stable-20210308 + - os: ubuntu-20.04 + version: stable-20210319 + - os: macos-latest + version: stable-20210319 + - os: ubuntu-20.04 + version: stable-20210809 + - os: macos-latest + version: stable-20210809 + - os: ubuntu-latest + version: cached + - os: macos-latest + version: cached + - os: ubuntu-latest + version: latest + - os: macos-latest + version: latest + - os: ubuntu-latest + version: nightly-latest + - os: macos-latest + version: nightly-latest name: Upload debug artifacts timeout-minutes: 45 runs-on: ${{ matrix.os }} @@ -58,11 +81,17 @@ jobs: - name: Check expected artifacts exist shell: bash run: | - OPERATING_SYSTEMS="ubuntu-latest macos-latest" VERSIONS="stable-20210308 stable-20210319 stable-20210809 cached latest nightly-latest" LANGUAGES="cpp csharp go java javascript python" - for os in $OPERATING_SYSTEMS; do - for version in $VERSIONS; do + for version in $VERSIONS; do + if [[ "$version" =~ stable-(20210308|20210319|20210809) ]]; then + # Note the absence of the period in "ubuntu-2004": this is present in the image name + # but not the artifact name + OPERATING_SYSTEMS="ubuntu-2004 macos-latest" + else + OPERATING_SYSTEMS="ubuntu-latest macos-latest" + fi + for os in $OPERATING_SYSTEMS; do pushd "./my-debug-artifacts-$os-$version" echo "Artifacts from version $version on $os:" for language in $LANGUAGES; do diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index a97ef1d405..4bd7bcb4be 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -16,7 +16,6 @@ jobs: timeout-minutes: 45 strategy: - fail-fast: true matrix: node-types-version: [12.12, current] diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml index 9f43459dac..eeb6d88ead 100644 --- a/.github/workflows/python-deps.yml +++ b/.github/workflows/python-deps.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ubuntu-22.04, macos-latest] + os: [ubuntu-20.04, ubuntu-22.04, macos-latest] python_deps_type: [pipenv, poetry, requirements, setup_py] python_version: [2, 3] exclude: @@ -65,7 +65,7 @@ jobs: cd $GITHUB_WORKSPACE/python-setup/tests/${PYTHON_DEPS_TYPE}/requests-${PYTHON_VERSION} case ${{ matrix.os }} in - ubuntu-latest*) basePath="/opt";; + ubuntu-20.04*) basePath="/opt";; ubuntu-22.04*) basePath="/opt";; macos-latest*) basePath="/Users/runner";; esac @@ -90,7 +90,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, ubuntu-22.04, macos-latest] + os: [ubuntu-20.04, ubuntu-22.04, macos-latest] steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -112,7 +112,7 @@ jobs: cd $GITHUB_WORKSPACE/python-setup/tests/requirements/non-standard-location case ${{ matrix.os }} in - ubuntu-latest*) basePath="/opt";; + ubuntu-20.04*) basePath="/opt";; ubuntu-22.04*) basePath="/opt";; macos-latest*) basePath="/Users/runner";; esac diff --git a/.github/workflows/unset-environment-new-cli.yml b/.github/workflows/unset-environment-new-cli.yml index 39da1b36c6..959a1663af 100644 --- a/.github/workflows/unset-environment-new-cli.yml +++ b/.github/workflows/unset-environment-new-cli.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210809 - os: ubuntu-latest version: cached diff --git a/.github/workflows/unset-environment-old-cli.yml b/.github/workflows/unset-environment-old-cli.yml index 281ced054c..30ec0dd1a8 100644 --- a/.github/workflows/unset-environment-old-cli.yml +++ b/.github/workflows/unset-environment-old-cli.yml @@ -24,9 +24,9 @@ jobs: strategy: matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210308 - - os: ubuntu-latest + - os: ubuntu-20.04 version: stable-20210319 name: Test unsetting environment variables timeout-minutes: 45 diff --git a/pr-checks/checks/extractor-ram-threads.yml b/pr-checks/checks/extractor-ram-threads.yml index 5a1373cbef..29b605dc8a 100644 --- a/pr-checks/checks/extractor-ram-threads.yml +++ b/pr-checks/checks/extractor-ram-threads.yml @@ -1,7 +1,7 @@ name: "Extractor ram and threads options test" description: "Tests passing RAM and threads limits to extractors" versions: ["latest"] -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/go-custom-tracing-autobuild.yml b/pr-checks/checks/go-custom-tracing-autobuild.yml index b5947298ad..57c830f413 100644 --- a/pr-checks/checks/go-custom-tracing-autobuild.yml +++ b/pr-checks/checks/go-custom-tracing-autobuild.yml @@ -1,6 +1,6 @@ name: "Go: Autobuild custom tracing" description: "Checks that Go tracing works in conjunction with the autobuilder" -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] env: CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on" DOTNET_GENERATE_ASPNET_CERTIFICATE: "false" diff --git a/pr-checks/checks/go-reconciled-tracing-autobuilder.yml b/pr-checks/checks/go-reconciled-tracing-autobuilder.yml index cb7ed01eea..d4494375f1 100644 --- a/pr-checks/checks/go-reconciled-tracing-autobuilder.yml +++ b/pr-checks/checks/go-reconciled-tracing-autobuilder.yml @@ -1,6 +1,6 @@ name: "Go: Reconciled tracing with autobuilder" description: "Checks that Go reconciled tracing works when using an autobuilder step" -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] env: CODEQL_ACTION_RECONCILE_GO_EXTRACTION: "true" DOTNET_GENERATE_ASPNET_CERTIFICATE: "false" diff --git a/pr-checks/checks/go-reconciled-tracing-legacy-workflow.yml b/pr-checks/checks/go-reconciled-tracing-legacy-workflow.yml index b911bcfeaf..761f3cc7cb 100644 --- a/pr-checks/checks/go-reconciled-tracing-legacy-workflow.yml +++ b/pr-checks/checks/go-reconciled-tracing-legacy-workflow.yml @@ -1,6 +1,6 @@ name: "Go: Reconciled tracing with legacy workflow" description: "Checks that we run the autobuilder in legacy workflows with neither an autobuild step nor manual build steps" -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] env: # Enable reconciled Go tracing beta functionality CODEQL_ACTION_RECONCILE_GO_EXTRACTION: "true" diff --git a/pr-checks/checks/javascript-source-root.yml b/pr-checks/checks/javascript-source-root.yml index a16089f10e..7b30cb5a19 100644 --- a/pr-checks/checks/javascript-source-root.yml +++ b/pr-checks/checks/javascript-source-root.yml @@ -1,7 +1,7 @@ name: "Custom source root" description: "Checks that the argument specifying a non-default source root works" versions: ["latest", "cached", "nightly-latest"] # This feature is not compatible with old CLIs -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] steps: - name: Move codeql-action shell: bash diff --git a/pr-checks/checks/ml-powered-queries.yml b/pr-checks/checks/ml-powered-queries.yml index dea97c470c..58296a9bfc 100644 --- a/pr-checks/checks/ml-powered-queries.yml +++ b/pr-checks/checks/ml-powered-queries.yml @@ -7,8 +7,6 @@ versions: [ "latest", "nightly-latest", ] -# Test on all three platforms since ML-powered queries use native code -os: ["ubuntu-latest", "macos-latest", "windows-latest"] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml index b623369af4..69e5091a7b 100644 --- a/pr-checks/checks/multi-language-autodetect.yml +++ b/pr-checks/checks/multi-language-autodetect.yml @@ -1,6 +1,6 @@ name: "Multi-language repository" description: "An end-to-end integration test of a multi-language repository using automatic language detection" -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/rubocop-multi-language.yml b/pr-checks/checks/rubocop-multi-language.yml index d5a50839fe..504b1d3b4d 100644 --- a/pr-checks/checks/rubocop-multi-language.yml +++ b/pr-checks/checks/rubocop-multi-language.yml @@ -1,6 +1,8 @@ name: "RuboCop multi-language" description: "Tests using RuboCop to analyze a multi-language repository and then using the CodeQL Action to upload the resulting SARIF" -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] +# This check doesn't use CodeQL, so the `version` matrix variable is unused. +versions: ["cached"] steps: - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/pr-checks/checks/split-workflow.yml b/pr-checks/checks/split-workflow.yml index 9f16802f32..9bea010f0a 100644 --- a/pr-checks/checks/split-workflow.yml +++ b/pr-checks/checks/split-workflow.yml @@ -1,6 +1,6 @@ name: "Split workflow" description: "Tests a split-up workflow in which we first build a database and later analyze it" -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] versions: ["latest", "cached", "nightly-latest"] # This feature is not compatible with old CLIs steps: - uses: ./../action/init diff --git a/pr-checks/checks/test-autobuild-working-dir.yml b/pr-checks/checks/test-autobuild-working-dir.yml index e28a2ae6e2..6f8aa0a58e 100644 --- a/pr-checks/checks/test-autobuild-working-dir.yml +++ b/pr-checks/checks/test-autobuild-working-dir.yml @@ -1,7 +1,7 @@ name: "Autobuild working directory" description: "Tests working-directory input of autobuild action" versions: ["latest"] -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] steps: - name: Test setup shell: bash diff --git a/pr-checks/checks/test-local-codeql.yml b/pr-checks/checks/test-local-codeql.yml index 4b9305b3e8..ce36df45ce 100644 --- a/pr-checks/checks/test-local-codeql.yml +++ b/pr-checks/checks/test-local-codeql.yml @@ -1,7 +1,7 @@ name: "Local CodeQL bundle" description: "Tests using a CodeQL bundle from a local file rather than a URL" versions: ["nightly-latest"] -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] steps: - name: Fetch a CodeQL bundle shell: bash diff --git a/pr-checks/checks/test-proxy.yml b/pr-checks/checks/test-proxy.yml index a540142a50..45bb8361f7 100644 --- a/pr-checks/checks/test-proxy.yml +++ b/pr-checks/checks/test-proxy.yml @@ -1,7 +1,7 @@ name: "Proxy test" description: "Tests using a proxy specified by the https_proxy environment variable" versions: ["latest"] -os: ["ubuntu-latest"] +operatingSystems: ["ubuntu"] container: image: ubuntu:18.04 options: --dns 127.0.0.1 diff --git a/pr-checks/checks/test-ruby.yml b/pr-checks/checks/test-ruby.yml index f4d3b0ff70..3273240909 100644 --- a/pr-checks/checks/test-ruby.yml +++ b/pr-checks/checks/test-ruby.yml @@ -1,7 +1,7 @@ name: "Ruby analysis" description: "Tests creation of a Ruby database" versions: ["latest", "cached", "nightly-latest"] -os: ["ubuntu-latest", "macos-latest"] +operatingSystems: ["ubuntu", "macos"] env: CODEQL_ENABLE_EXPERIMENTAL_FEATURES: "true" steps: diff --git a/pr-checks/checks/with-checkout-path.yml b/pr-checks/checks/with-checkout-path.yml index eda27e4f3a..84bddda78d 100644 --- a/pr-checks/checks/with-checkout-path.yml +++ b/pr-checks/checks/with-checkout-path.yml @@ -1,9 +1,5 @@ name: "Use a custom `checkout_path`" description: "Checks that a custom `checkout_path` will find the proper commit_oid" -# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of -# `windows-latest`. -# Must test on all three platforms since this test does path manipulation -os: [ubuntu-latest, macos-latest, windows-2019] steps: # Check out the actions repo again, but at a different location. # choose an arbitrary SHA so that we can later test that the commit_oid is not from main diff --git a/pr-checks/sync.py b/pr-checks/sync.py index f1d2136355..8682805aec 100644 --- a/pr-checks/sync.py +++ b/pr-checks/sync.py @@ -1,6 +1,7 @@ import ruamel.yaml import os +# The default set of CodeQL Bundle versions to use for the PR checks. defaultTestVersions = [ # The oldest supported CodeQL version: 2.4.5. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts` "stable-20210308", @@ -15,7 +16,24 @@ # A nightly build directly from the our private repo, built in the last 24 hours. "nightly-latest" ] -defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-2019"] + + +def isCompatibleWithLatestImages(version): + if version in ["cached", "latest", "nightly-latest"]: + return True + date = version.split("-")[1] + # The first version of the CodeQL CLI compatible with `ubuntu-22.04` and `windows-2022` is + # 2.7.3. This appears in CodeQL Bundle version codeql-bundle-20211208. + return date >= "20211208" + + +def operatingSystemsForVersion(version): + if isCompatibleWithLatestImages(version): + return ["ubuntu-latest", "macos-latest", "windows-latest"] + else: + return ["ubuntu-20.04", "macos-latest", "windows-2019"] + + header = """# Warning: This file is generated automatically, and should not be modified. # Instead, please modify the template in the pr-checks directory and run: # pip install ruamel.yaml && python3 sync.py @@ -23,6 +41,7 @@ """ + class NonAliasingRTRepresenter(ruamel.yaml.representer.RoundTripRepresenter): def ignore_aliases(self, data): return True @@ -39,13 +58,6 @@ def writeHeader(checkStream): with open(f"checks/{file}", 'r') as checkStream: checkSpecification = yaml.load(checkStream) - versions = defaultTestVersions - if 'versions' in checkSpecification: - versions = checkSpecification['versions'] - operatingSystems = defaultOperatingSystems - if 'os' in checkSpecification: - operatingSystems = checkSpecification['os'] - steps = [ { 'name': 'Check out repository', @@ -63,20 +75,17 @@ def writeHeader(checkStream): steps.extend(checkSpecification['steps']) matrix = [] - for version in versions: - for os in operatingSystems: + for version in checkSpecification.get('versions', defaultTestVersions): + runnerImages = operatingSystemsForVersion(version) + if checkSpecification.get('operatingSystems', None): + runnerImages = [image for image in runnerImages for operatingSystem in checkSpecification['operatingSystems'] + if image.startswith(operatingSystem)] + + for runnerImage in runnerImages: matrix.append({ - 'os': os, + 'os': runnerImage, 'version': version }) - if (version == 'latest' or version == 'nightly-latest') and os == 'windows-2019': - # New versions of the CLI should also work with Windows Server 2022. - # Once all versions of the CLI that we test against work with Windows Server 2022, - # we should remove this logic and instead just add windows-2022 to the test matrix. - matrix.append({ - 'os': 'windows-2022', - 'version': version - }) checkJob = { 'strategy': { 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