Skip to content

Commit a777a98

Browse files
authored
Merge pull request #917 from github/henrymercer/fix-windows-latest-ci-jobs
Fix CI jobs that broke as a result of `windows-latest` being upgraded to Windows Server 2022
2 parents edd03fb + 8dd2b9a commit a777a98

12 files changed

+27
-23
lines changed

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

+1-4
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-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

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

.github/workflows/__remote-config.yml

+1-4
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-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pr-checks.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ jobs:
182182
runner-analyze-csharp-windows:
183183
name: Runner windows C# analyze
184184
needs: [check-js, check-node-modules]
185-
runs-on: windows-latest
185+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
186+
# `windows-latest`.
187+
runs-on: windows-2019
186188

187189
steps:
188190
- uses: actions/checkout@v2
@@ -301,7 +303,9 @@ jobs:
301303
runner-analyze-csharp-autobuild-windows:
302304
name: Runner windows autobuild C# analyze
303305
needs: [check-js, check-node-modules]
304-
runs-on: windows-latest
306+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
307+
# `windows-latest`.
308+
runs-on: windows-2019
305309

306310
steps:
307311
- uses: actions/checkout@v2

.github/workflows/python-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125

126126
- uses: actions/setup-python@v2
127127
with:
128-
python-version: ${{ matrix.python-version }}
128+
python-version: ${{ matrix.python_version }}
129129

130130
- name: Initialize CodeQL
131131
uses: ./init

pr-checks/checks/analyze-ref-input.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: "Analyze: 'ref' and 'sha' from inputs"
22
description: "Checks that specifying 'ref' and 'sha' as inputs works"
3+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
4+
# `windows-latest`.
5+
os: [ubuntu-latest, macos-latest, windows-2019]
36
steps:
47
- uses: ./../action/init
58
with:

pr-checks/checks/go-custom-queries.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: "Go: Custom queries"
22
description: "Checks that Go works in conjunction with a config file specifying custom queries"
3+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
4+
# `windows-latest`.
5+
os: [ubuntu-latest, macos-latest, windows-2019]
36
steps:
47
- uses: actions/setup-go@v2
58
with:

pr-checks/checks/go-custom-tracing.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: "Go: Custom tracing"
22
description: "Checks that Go tracing works"
3+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
4+
# `windows-latest`.
5+
os: [ubuntu-latest, macos-latest, windows-2019]
36
env:
47
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "true"
58
steps:

pr-checks/checks/remote-config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: "Remote config file"
22
description: "Checks that specifying packages using only a config file works"
3+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
4+
# `windows-latest`.
5+
os: [ubuntu-latest, macos-latest, windows-2019]
36
steps:
47
- uses: ./../action/init
58
with:

pr-checks/checks/upload-ref-sha-input.yml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: "Upload-sarif: 'ref' and 'sha' from inputs"
22
description: "Checks that specifying 'ref' and 'sha' as inputs works"
3+
# Build tracing currently does not support Windows 2022, so use `windows-2019` instead of
4+
# `windows-latest`.
5+
os: [ubuntu-latest, macos-latest, windows-2019]
36
steps:
47
- uses: ./../action/init
58
with:

0 commit comments

Comments
 (0)