Skip to content

Commit 1489c9c

Browse files
committed
Exclude Swift on macos for version 2.14.6
1 parent 34919cb commit 1489c9c

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

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

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

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ steps:
1010
id: init
1111
with:
1212
db-location: "${{ runner.temp }}/customDbLocation"
13-
# Swift is not supported on Ubuntu so we manually exclude it from the list here
14-
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
13+
# Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
14+
languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
1515
tools: ${{ steps.prepare-test.outputs.tools-url }}
1616

1717
- uses: ./../action/.github/actions/setup-swift
18-
if: runner.os == 'macOS'
18+
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
19+
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
1920
with:
2021
codeql-path: ${{ steps.init.outputs.codeql-path }}
2122

@@ -68,7 +69,8 @@ steps:
6869
fi
6970
7071
- name: Check language autodetect for Swift on macOS
71-
if: runner.os == 'macOS'
72+
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
73+
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
7274
shell: bash
7375
run: |
7476
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}

tests/multi-language-repo/build.sh

+2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ javac Main.java
88

99
go build main.go
1010

11+
# Not all platforms support Swift
1112
if [[ "$OSTYPE" == "darwin"* ]]; then
13+
echo "Compiling Swift"
1214
swift build
1315
fi
1416

0 commit comments

Comments
 (0)