Exclude Swift on macos for version 2.14.6
This commit is contained in:
Родитель
34919cb664
Коммит
1489c9c992
|
@ -88,13 +88,15 @@ jobs:
|
||||||
id: init
|
id: init
|
||||||
with:
|
with:
|
||||||
db-location: ${{ runner.temp }}/customDbLocation
|
db-location: ${{ runner.temp }}/customDbLocation
|
||||||
# Swift is not supported on Ubuntu so we manually exclude it from the list here
|
# Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
|
||||||
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby'
|
languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version
|
||||||
|| '' }}
|
== 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' ||
|
||||||
|
'' }}
|
||||||
tools: ${{ steps.prepare-test.outputs.tools-url }}
|
tools: ${{ steps.prepare-test.outputs.tools-url }}
|
||||||
|
|
||||||
- uses: ./../action/.github/actions/setup-swift
|
- uses: ./../action/.github/actions/setup-swift
|
||||||
if: runner.os == 'macOS'
|
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
|
||||||
|
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
|
||||||
with:
|
with:
|
||||||
codeql-path: ${{ steps.init.outputs.codeql-path }}
|
codeql-path: ${{ steps.init.outputs.codeql-path }}
|
||||||
|
|
||||||
|
@ -147,7 +149,8 @@ jobs:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Check language autodetect for Swift on macOS
|
- name: Check language autodetect for Swift on macOS
|
||||||
if: runner.os == 'macOS'
|
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
|
||||||
|
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
|
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
|
||||||
|
|
|
@ -10,12 +10,13 @@ steps:
|
||||||
id: init
|
id: init
|
||||||
with:
|
with:
|
||||||
db-location: "${{ runner.temp }}/customDbLocation"
|
db-location: "${{ runner.temp }}/customDbLocation"
|
||||||
# Swift is not supported on Ubuntu so we manually exclude it from the list here
|
# Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
|
||||||
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
|
languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
|
||||||
tools: ${{ steps.prepare-test.outputs.tools-url }}
|
tools: ${{ steps.prepare-test.outputs.tools-url }}
|
||||||
|
|
||||||
- uses: ./../action/.github/actions/setup-swift
|
- uses: ./../action/.github/actions/setup-swift
|
||||||
if: runner.os == 'macOS'
|
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
|
||||||
|
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
|
||||||
with:
|
with:
|
||||||
codeql-path: ${{ steps.init.outputs.codeql-path }}
|
codeql-path: ${{ steps.init.outputs.codeql-path }}
|
||||||
|
|
||||||
|
@ -68,7 +69,8 @@ steps:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Check language autodetect for Swift on macOS
|
- name: Check language autodetect for Swift on macOS
|
||||||
if: runner.os == 'macOS'
|
# Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
|
||||||
|
if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
|
SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}
|
||||||
|
|
|
@ -8,7 +8,9 @@ javac Main.java
|
||||||
|
|
||||||
go build main.go
|
go build main.go
|
||||||
|
|
||||||
|
# Not all platforms support Swift
|
||||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
|
echo "Compiling Swift"
|
||||||
swift build
|
swift build
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче