Skip to content

Commit ea4581b

Browse files
committed
PR checks: Manually exclude Swift from init languages on Linux
1 parent 9fbd0b9 commit ea4581b

10 files changed

+39
-7
lines changed

.github/workflows/__all-platform-bundle.yml

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

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

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

.github/workflows/__test-local-codeql.yml

Lines changed: 1 addition & 0 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: 2 additions & 0 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
debug: true
5353
debug-artifact-name: my-debug-artifacts
5454
debug-database-name: my-db
55+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
56+
languages: cpp,csharp,go,java,javascript,python,ruby
5557
- name: Build code
5658
shell: bash
5759
run: ./build.sh

.github/workflows/test-codeql-bundle-all.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
- id: init
4343
uses: ./../action/init
4444
with:
45+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
46+
languages: cpp,csharp,go,java,javascript,python,ruby
4547
tools: ${{ steps.prepare-test.outputs.tools-url }}
4648
- name: Build code
4749
shell: bash

pr-checks/checks/all-platform-bundle.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
- id: init
88
uses: ./../action/init
99
with:
10+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
11+
languages: cpp,csharp,go,java,javascript,python,ruby
1012
tools: ${{ steps.prepare-test.outputs.tools-url }}
1113
- name: Build code
1214
shell: bash

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
name: "Multi-language repository"
2-
description: "An end-to-end integration test of a multi-language repository using automatic language detection"
2+
description: "An end-to-end integration test of a multi-language repository using automatic language detection for MacOS"
33
operatingSystems: ["macos", "ubuntu"]
44
steps:
55
- uses: actions/setup-go@v5
66
with:
77
go-version: ">=1.21.0"
88

99
- uses: ./../action/init
10-
id: init
10+
if: runner.os == 'Linux'
11+
with:
12+
db-location: "${{ runner.temp }}/customDbLocation"
13+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
14+
languages: cpp,csharp,go,java,javascript,python,ruby
15+
tools: ${{ steps.prepare-test.outputs.tools-url }}
16+
17+
- uses: ./../action/init
18+
id: init-macos
19+
if: runner.os == 'macOS'
1120
with:
1221
db-location: "${{ runner.temp }}/customDbLocation"
1322
tools: ${{ steps.prepare-test.outputs.tools-url }}
1423

1524
- uses: ./../action/.github/actions/setup-swift
1625
if: runner.os == 'macOS'
1726
with:
18-
codeql-path: ${{ steps.init.outputs.codeql-path }}
27+
codeql-path: ${{ steps.init-macos.outputs.codeql-path }}
1928

2029
- name: Build code
2130
shell: bash
@@ -66,7 +75,7 @@ steps:
6675
fi
6776
6877
- name: Check language autodetect for Swift on MacOS
69-
if: runner.os == 'macOS'
78+
if: runner.os == 'macOS' && matrix.version != 'stable-20230403'
7079
shell: bash
7180
run: |
7281
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}

pr-checks/checks/test-local-codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ steps:
1212
- id: init
1313
uses: ./../action/init
1414
with:
15+
languages: cpp,csharp,go,java,javascript,python,ruby
1516
tools: ./codeql-bundle-linux64.tar.gz
1617
- name: Build code
1718
shell: bash

pr-checks/checks/unset-environment.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
id: init
88
with:
99
db-location: ${{ runner.temp }}/customDbLocation
10+
# We manually exclude Swift from the languages list here, as it is not supported on Ubuntu
11+
languages: cpp,csharp,go,java,javascript,python,ruby
1012
tools: ${{ steps.prepare-test.outputs.tools-url }}
1113
- uses: actions/setup-go@v5
1214
with:

0 commit comments

Comments
 (0)