Skip to content

Commit

Permalink
Merge pull request #917 from github/henrymercer/fix-windows-latest-ci…
Browse files Browse the repository at this point in the history
…-jobs

Fix CI jobs that broke as a result of `windows-latest` being upgraded to Windows Server 2022
  • Loading branch information
henrymercer committed Feb 8, 2022
2 parents edd03fb + 8dd2b9a commit a777a98
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 23 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/__analyze-ref-input.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .github/workflows/__go-custom-queries.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .github/workflows/__go-custom-tracing.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .github/workflows/__remote-config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions .github/workflows/__upload-ref-sha-input.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .github/workflows/pr-checks.yml
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-deps.yml
Expand Up @@ -125,7 +125,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ matrix.python_version }}

- name: Initialize CodeQL
uses: ./init
Expand Down
3 changes: 3 additions & 0 deletions 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:
Expand Down
3 changes: 3 additions & 0 deletions 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:
Expand Down
3 changes: 3 additions & 0 deletions 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:
Expand Down
3 changes: 3 additions & 0 deletions 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:
Expand Down
3 changes: 3 additions & 0 deletions 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:
Expand Down

0 comments on commit a777a98

Please sign in to comment.