Skip to content

Commit

Permalink
five min timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
aeisenberg committed Mar 10, 2022
1 parent 74da9d1 commit 852be69
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 61 deletions.
41 changes: 2 additions & 39 deletions .github/workflows/__with-checkout-path.yml

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

4 changes: 2 additions & 2 deletions pr-checks/checks/with-checkout-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Checks that a custom `checkout_path` will find the proper commit_o
# 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]
os: [macos-latest]
env:
DOTNET_CLI_TELEMETRY_OPTOUT: true
steps:
Expand All @@ -29,7 +29,7 @@ steps:
$CODEQL_RUNNER x/y/z/some-path/tests/multi-language-repo/build.sh &
PID=$!
sleep 60
sleep 300
ps -ef
Expand Down
21 changes: 1 addition & 20 deletions pr-checks/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,9 @@
import os

defaultTestVersions = [
# The oldest supported CodeQL version: 2.4.5. If bumping, update `CODEQL_MINIMUM_VERSION` in `codeql.ts`
"stable-20210308",
# The last CodeQL release in the 2.4 series: 2.4.6.
"stable-20210319",
# The last CodeQL release in the 2.5 series: 2.5.9.
"stable-20210809",
# The version of CodeQL currently in the toolcache. Typically either the latest release or the one before.
"cached",
# The latest release of CodeQL.
"latest",
# A nightly build directly from the our private repo, built in the last 24 hours.
"nightly-latest"
]
defaultOperatingSystems = ["ubuntu-latest", "macos-latest", "windows-2019"]
defaultOperatingSystems = ["macos-latest"]
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
Expand Down Expand Up @@ -69,14 +58,6 @@ def writeHeader(checkStream):
'os': os,
'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': {
Expand Down

0 comments on commit 852be69

Please sign in to comment.