Skip to content

Commit d61a10a

Browse files
authored
Merge branch 'main' into mbg/cq/analysis-kinds-input
2 parents 270f7ad + 046c593 commit d61a10a

File tree

9 files changed

+18
-69
lines changed

9 files changed

+18
-69
lines changed

.github/actions/setup-swift/action.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/__export-file-baseline-information.yml

Lines changed: 0 additions & 4 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: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__swift-autobuild.yml

Lines changed: 0 additions & 3 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: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pr-checks/checks/export-file-baseline-information.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ steps:
1010
with:
1111
languages: javascript
1212
tools: ${{ steps.prepare-test.outputs.tools-url }}
13-
- uses: ./../action/.github/actions/setup-swift
14-
if: runner.os == 'macOS'
15-
with:
16-
codeql-path: ${{ steps.init.outputs.codeql-path }}
1713
- name: Build code
1814
shell: bash
1915
run: ./build.sh

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ description: "An end-to-end integration test of a multi-language repository usin
33
operatingSystems: ["macos", "ubuntu"]
44
installGo: "true"
55
steps:
6+
- name: Use Xcode 16
7+
shell: bash
8+
if: runner.os == 'macOS' && matrix.version != 'nightly-latest'
9+
run: sudo xcode-select -s "/Applications/Xcode_16.app"
10+
611
- uses: ./../action/init
712
id: init
813
with:
914
db-location: "${{ runner.temp }}/customDbLocation"
1015
languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
1116
tools: ${{ steps.prepare-test.outputs.tools-url }}
1217

13-
- uses: ./../action/.github/actions/setup-swift
14-
if: runner.os == 'macOS'
15-
with:
16-
codeql-path: ${{ steps.init.outputs.codeql-path }}
17-
1818
- name: Build code
1919
shell: bash
2020
run: ./build.sh

pr-checks/checks/swift-autobuild.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ steps:
99
languages: swift
1010
build-mode: autobuild
1111
tools: ${{ steps.prepare-test.outputs.tools-url }}
12-
- uses: ./../action/.github/actions/setup-swift
13-
with:
14-
codeql-path: ${{steps.init.outputs.codeql-path}}
1512
- name: Check working directory
1613
shell: bash
1714
run: pwd

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ installGo: "true"
66
env:
77
DOTNET_GENERATE_ASPNET_CERTIFICATE: "false"
88
steps:
9+
- name: Use Xcode 16
10+
shell: bash
11+
if: runner.os == 'macOS' && matrix.version != 'nightly-latest'
12+
run: sudo xcode-select -s "/Applications/Xcode_16.app"
913
- uses: ./../action/init
1014
id: init
1115
with:
1216
languages: swift
1317
tools: ${{ steps.prepare-test.outputs.tools-url }}
14-
- uses: ./../action/.github/actions/setup-swift
15-
with:
16-
codeql-path: ${{steps.init.outputs.codeql-path}}
1718
- name: Check working directory
1819
shell: bash
1920
run: pwd

0 commit comments

Comments
 (0)