From b8047e561097f48d55bc35c1fc71802a6038fb1c Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Tue, 8 Feb 2022 11:21:42 +0000 Subject: [PATCH] Use `windows-2019` for CI jobs involving build tracing Build tracing currently does not support Windows 2022, so use `windows-2019` instead of`windows-latest`. --- .github/workflows/__analyze-ref-input.yml | 5 +---- .github/workflows/__go-custom-queries.yml | 5 +---- .github/workflows/__go-custom-tracing.yml | 5 +---- .github/workflows/__remote-config.yml | 5 +---- .github/workflows/__upload-ref-sha-input.yml | 5 +---- .github/workflows/pr-checks.yml | 8 ++++++-- pr-checks/checks/analyze-ref-input.yml | 3 +++ pr-checks/checks/go-custom-queries.yml | 3 +++ pr-checks/checks/go-custom-tracing.yml | 3 +++ pr-checks/checks/remote-config.yml | 3 +++ pr-checks/checks/upload-ref-sha-input.yml | 3 +++ 11 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/__analyze-ref-input.yml b/.github/workflows/__analyze-ref-input.yml index 71997984b7..948966f49e 100644 --- a/.github/workflows/__analyze-ref-input.yml +++ b/.github/workflows/__analyze-ref-input.yml @@ -30,10 +30,7 @@ jobs: - cached - latest - nightly-latest - os: - - ubuntu-latest - - macos-latest - - windows-latest + os: [ubuntu-latest, macos-latest, windows-2019] name: "Analyze: 'ref' and 'sha' from inputs" runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__go-custom-queries.yml b/.github/workflows/__go-custom-queries.yml index 2e71b5cff2..04cabdae78 100644 --- a/.github/workflows/__go-custom-queries.yml +++ b/.github/workflows/__go-custom-queries.yml @@ -30,10 +30,7 @@ jobs: - cached - latest - nightly-latest - os: - - ubuntu-latest - - macos-latest - - windows-latest + os: [ubuntu-latest, macos-latest, windows-2019] name: 'Go: Custom queries' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__go-custom-tracing.yml b/.github/workflows/__go-custom-tracing.yml index 49bf78e67f..0eb425a1f2 100644 --- a/.github/workflows/__go-custom-tracing.yml +++ b/.github/workflows/__go-custom-tracing.yml @@ -30,10 +30,7 @@ jobs: - cached - latest - nightly-latest - os: - - ubuntu-latest - - macos-latest - - windows-latest + os: [ubuntu-latest, macos-latest, windows-2019] name: 'Go: Custom tracing' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__remote-config.yml b/.github/workflows/__remote-config.yml index 4dd45d04cf..82aca1360e 100644 --- a/.github/workflows/__remote-config.yml +++ b/.github/workflows/__remote-config.yml @@ -30,10 +30,7 @@ jobs: - cached - latest - nightly-latest - os: - - ubuntu-latest - - macos-latest - - windows-latest + os: [ubuntu-latest, macos-latest, windows-2019] name: Remote config file runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/__upload-ref-sha-input.yml b/.github/workflows/__upload-ref-sha-input.yml index 72cf3b24d4..1918891f0d 100644 --- a/.github/workflows/__upload-ref-sha-input.yml +++ b/.github/workflows/__upload-ref-sha-input.yml @@ -30,10 +30,7 @@ jobs: - cached - latest - nightly-latest - os: - - ubuntu-latest - - macos-latest - - windows-latest + os: [ubuntu-latest, macos-latest, windows-2019] name: "Upload-sarif: 'ref' and 'sha' from inputs" runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 704f9e31db..994eee140b 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -182,7 +182,9 @@ jobs: runner-analyze-csharp-windows: name: Runner windows C# analyze needs: [check-js, check-node-modules] - runs-on: windows-latest + # Build tracing currently does not support Windows 2022, so use `windows-2019` instead of + # `windows-latest`. + runs-on: windows-2019 steps: - uses: actions/checkout@v2 @@ -301,7 +303,9 @@ jobs: runner-analyze-csharp-autobuild-windows: name: Runner windows autobuild C# analyze needs: [check-js, check-node-modules] - runs-on: windows-latest + # Build tracing currently does not support Windows 2022, so use `windows-2019` instead of + # `windows-latest`. + runs-on: windows-2019 steps: - uses: actions/checkout@v2 diff --git a/pr-checks/checks/analyze-ref-input.yml b/pr-checks/checks/analyze-ref-input.yml index 88714c955e..34876f198b 100644 --- a/pr-checks/checks/analyze-ref-input.yml +++ b/pr-checks/checks/analyze-ref-input.yml @@ -1,5 +1,8 @@ name: "Analyze: 'ref' and 'sha' from inputs" description: "Checks that specifying 'ref' and 'sha' as inputs works" +# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of +# `windows-latest`. +os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/go-custom-queries.yml b/pr-checks/checks/go-custom-queries.yml index c17b9348a8..b0e1cfdd0f 100644 --- a/pr-checks/checks/go-custom-queries.yml +++ b/pr-checks/checks/go-custom-queries.yml @@ -1,5 +1,8 @@ name: "Go: Custom queries" description: "Checks that Go works in conjunction with a config file specifying custom queries" +# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of +# `windows-latest`. +os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: actions/setup-go@v2 with: diff --git a/pr-checks/checks/go-custom-tracing.yml b/pr-checks/checks/go-custom-tracing.yml index d503134925..1205dce0b3 100644 --- a/pr-checks/checks/go-custom-tracing.yml +++ b/pr-checks/checks/go-custom-tracing.yml @@ -1,5 +1,8 @@ name: "Go: Custom tracing" description: "Checks that Go tracing works" +# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of +# `windows-latest`. +os: [ubuntu-latest, macos-latest, windows-2019] env: CODEQL_EXTRACTOR_GO_BUILD_TRACING: "true" steps: diff --git a/pr-checks/checks/remote-config.yml b/pr-checks/checks/remote-config.yml index 68f053a4bc..5ee2f6b0e2 100644 --- a/pr-checks/checks/remote-config.yml +++ b/pr-checks/checks/remote-config.yml @@ -1,5 +1,8 @@ name: "Remote config file" description: "Checks that specifying packages using only a config file works" +# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of +# `windows-latest`. +os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: diff --git a/pr-checks/checks/upload-ref-sha-input.yml b/pr-checks/checks/upload-ref-sha-input.yml index b04ea977ce..717781e650 100644 --- a/pr-checks/checks/upload-ref-sha-input.yml +++ b/pr-checks/checks/upload-ref-sha-input.yml @@ -1,5 +1,8 @@ name: "Upload-sarif: 'ref' and 'sha' from inputs" description: "Checks that specifying 'ref' and 'sha' as inputs works" +# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of +# `windows-latest`. +os: [ubuntu-latest, macos-latest, windows-2019] steps: - uses: ./../action/init with: