Skip to content

Commit 3ee86e1

Browse files
authored
Merge pull request #2299 from github/angelapwen/fix-pr-checks
PR Checks: disable tests for Swift on Linux until CLI 2.17.4
2 parents 63d519c + 7c46681 commit 3ee86e1

9 files changed

+28
-58
lines changed

.github/workflows/__multi-language-autodetect.yml

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__scaling-reserved-ram.yml

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__swift-custom-build.yml

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__unset-environment.yml

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/debug-artifacts.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
version:
28-
- stable-20230403
29-
- stable-v2.13.5
30-
- stable-v2.14.6
28+
# TODO: Once CLI v2.17.4 is available and the platform is switched back to ubuntu,
29+
# stable-20230403, stable-v2.13.5, and stable-v2.14.6 can be added back to this matrix,
30+
# and the VERSIONS variable in the bash script below.
31+
# Prior to CLI v2.15.1, ARM runners were not supported by the build tracer.
3132
- stable-v2.15.5
3233
- stable-v2.16.6
3334
- default
@@ -37,7 +38,7 @@ jobs:
3738
env:
3839
CODEQL_ACTION_TEST_MODE: true
3940
timeout-minutes: 45
40-
runs-on: ubuntu-latest
41+
runs-on: macos-latest # TODO: Switch back to ubuntu for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4142
steps:
4243
- name: Check out repository
4344
uses: actions/checkout@v4
@@ -75,7 +76,7 @@ jobs:
7576
- name: Check expected artifacts exist
7677
shell: bash
7778
run: |
78-
VERSIONS="stable-20230403 stable-v2.13.5 stable-v2.14.6 stable-v2.15.5 stable-v2.16.6 default latest nightly-latest"
79+
VERSIONS="stable-v2.15.5 stable-v2.16.6 default latest nightly-latest"
7980
LANGUAGES="cpp csharp go java javascript python"
8081
for version in $VERSIONS; do
8182
pushd "./my-debug-artifacts-${version//./}"

pr-checks/checks/multi-language-autodetect.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Multi-language repository"
22
description: "An end-to-end integration test of a multi-language repository using automatic language detection"
3-
operatingSystems: ["ubuntu", "macos"]
3+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4+
operatingSystems: ["macos"]
45
steps:
56
- uses: actions/setup-go@v5
67
with:

pr-checks/checks/scaling-reserved-ram.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "Scaling reserved RAM"
22
description: "An end-to-end integration test of a multi-language repository with the scaling_reserved_ram feature flag enabled"
3-
operatingSystems: ["ubuntu", "macos"]
3+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
4+
operatingSystems: ["macos"]
45
env:
56
CODEQL_ACTION_SCALING_RESERVED_RAM: true
67
steps:

pr-checks/checks/swift-custom-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: "Swift analysis using a custom build command"
22
description: "Tests creation of a Swift database using custom build"
33
versions: ["latest", "default", "nightly-latest"]
4-
operatingSystems: ["ubuntu", "macos"]
4+
# TODO: Add ubuntu back for `nightly-latest` and `latest` once CLI v2.17.4 is available.
5+
operatingSystems: ["macos"]
56
env:
67
DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
78
steps:

pr-checks/checks/unset-environment.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: "Test unsetting environment variables"
22
description: "An end-to-end integration test that unsets some environment variables"
3-
operatingSystems: ["ubuntu"]
3+
# TODO: Switch back to all versions once CLI v2.17.4 is available and running on ubuntu again.
4+
versions: ["stable-v2.14.6", "stable-v2.15.5", "stable-v2.16.6", "latest", "default", "nightly-latest"]
5+
operatingSystems: ["macos"] # TODO: Switch back to ubuntu for `nightly-latest` and `latest` once CLI v2.17.4 is available.
46
steps:
57
- uses: ./../action/init
68
id: init
@@ -10,6 +12,9 @@ steps:
1012
- uses: ./../action/.github/actions/setup-swift
1113
with:
1214
codeql-path: ${{ steps.init.outputs.codeql-path }}
15+
- uses: actions/setup-go@v5
16+
with:
17+
go-version: '>=1.21.0'
1318
- name: Build code
1419
shell: bash
1520
# Disable Kotlin analysis while it's incompatible with Kotlin 1.8, until we find a

0 commit comments

Comments
 (0)