Skip to content

Commit 393d768

Browse files
paulb777paulb777
authored
Update CI to Xcode 15.1 (#12216)
1 parent 2a3fd2a commit 393d768

31 files changed

+137
-145
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- os: macos-12
3030
xcode: Xcode_14.2
3131
- os: macos-13
32-
xcode: Xcode_15.0.1
32+
xcode: Xcode_15.1
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v4
@@ -54,13 +54,13 @@ jobs:
5454
- os: macos-12
5555
xcode: Xcode_14.2
5656
- os: macos-13
57-
xcode: Xcode_15.0.1
57+
xcode: Xcode_15.1
5858
runs-on: ${{ matrix.os }}
5959
steps:
6060
- uses: actions/checkout@v4
6161
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6262
with:
63-
cache_key: ${{ matrix.os }}
63+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
6464
- name: Xcode
6565
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6666
- name: Initialize xcodebuild
@@ -77,7 +77,7 @@ jobs:
7777
- uses: actions/checkout@v4
7878
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
7979
with:
80-
cache_key: ${{ matrix.os }}
80+
cache_key: catalyst${{ matrix.os }}
8181
- uses: ruby/setup-ruby@v1
8282
- name: Setup Bundler
8383
run: scripts/setup_bundler.sh

‎.github/workflows/analytics.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- os: macos-12
2929
xcode: Xcode_14.2
3030
- os: macos-13
31-
xcode: Xcode_15.0.1
31+
xcode: Xcode_15.1
3232
runs-on: ${{ matrix.os }}
3333

3434
steps:

‎.github/workflows/appdistribution.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- os: macos-12
2828
xcode: Xcode_14.2
2929
- os: macos-13
30-
xcode: Xcode_15.0.1
30+
xcode: Xcode_15.1
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- uses: actions/checkout@v4
@@ -52,13 +52,13 @@ jobs:
5252
- os: macos-12
5353
xcode: Xcode_14.2
5454
- os: macos-13
55-
xcode: Xcode_15.0.1
55+
xcode: Xcode_15.1
5656
runs-on: ${{ matrix.os }}
5757
steps:
5858
- uses: actions/checkout@v4
5959
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6060
with:
61-
cache_key: ${{ matrix.os }}
61+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}
6262
- name: Xcode
6363
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6464
- name: Initialize xcodebuild
@@ -75,7 +75,7 @@ jobs:
7575
- uses: actions/checkout@v4
7676
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
7777
with:
78-
cache_key: ${{ matrix.os }}
78+
cache_key: catalyst${{ matrix.os }}
7979
- uses: ruby/setup-ruby@v1
8080
- name: Setup Bundler
8181
run: scripts/setup_bundler.sh

‎.github/workflows/archiving.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v4
2929
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
3030
with:
31-
cache_key: ${{ matrix.os }}
31+
cache_key: cron-${{ matrix.os }}
3232
- uses: ruby/setup-ruby@v1
3333
- name: Setup Bundler
3434
run: scripts/setup_bundler.sh
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v4
5252
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
5353
with:
54-
cache_key: ${{ matrix.os }}
54+
cache_key: pods-${{ matrix.os }}
5555
- uses: ruby/setup-ruby@v1
5656
- name: Setup Bundler
5757
run: scripts/setup_bundler.sh

‎.github/workflows/auth.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ jobs:
3030
include:
3131
- os: macos-12
3232
xcode: Xcode_14.2
33-
tests:
34-
# Flaky tests on CI
35-
- os: macos-13
36-
xcode: Xcode_15.0.1
3733
tests: --skip-tests
34+
- os: macos-13
35+
xcode: Xcode_15.1
36+
tests:
3837
runs-on: ${{ matrix.os }}
3938
steps:
4039
- uses: actions/checkout@v4
@@ -61,7 +60,7 @@ jobs:
6160
- uses: actions/checkout@v4
6261
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6362
with:
64-
cache_key: ${{ matrix.os }}
63+
cache_key: integration-tests${{ matrix.os }}
6564
- uses: ruby/setup-ruby@v1
6665
- name: Setup Bundler
6766
run: scripts/setup_bundler.sh
@@ -99,14 +98,14 @@ jobs:
9998
xcode: Xcode_14.2
10099
test: spm
101100
- os: macos-13
102-
xcode: Xcode_15.0.1
101+
xcode: Xcode_15.1
103102
test: spmbuildonly
104103
runs-on: ${{ matrix.os }}
105104
steps:
106105
- uses: actions/checkout@v4
107106
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
108107
with:
109-
cache_key: ${{ matrix.os }}
108+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
110109
- name: Xcode
111110
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
112111
- name: Initialize xcodebuild
@@ -122,7 +121,7 @@ jobs:
122121
- uses: actions/checkout@v4
123122
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
124123
with:
125-
cache_key: ${{ matrix.os }}
124+
cache_key: catalyst${{ matrix.os }}
126125
- uses: ruby/setup-ruby@v1
127126
- name: Setup Bundler
128127
run: scripts/setup_bundler.sh

‎.github/workflows/core.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- os: macos-12
2828
xcode: Xcode_14.2
2929
- os: macos-13
30-
xcode: Xcode_15.0.1
30+
xcode: Xcode_15.1
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- uses: actions/checkout@v4
@@ -50,13 +50,13 @@ jobs:
5050
- os: macos-12
5151
xcode: Xcode_14.2
5252
- os: macos-13
53-
xcode: Xcode_15.0.1
53+
xcode: Xcode_15.1
5454
runs-on: ${{ matrix.os }}
5555
steps:
5656
- uses: actions/checkout@v4
5757
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
5858
with:
59-
cache_key: ${{ matrix.os }}
59+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
6060
- name: Xcode
6161
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6262
- name: Initialize xcodebuild

‎.github/workflows/core_extension.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- os: macos-12
2626
xcode: Xcode_14.2
2727
- os: macos-13
28-
xcode: Xcode_15.0.1
28+
xcode: Xcode_15.1
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- uses: actions/checkout@v4

‎.github/workflows/core_internal.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- os: macos-12
2424
xcode: Xcode_14.2
2525
- os: macos-13
26-
xcode: Xcode_15.0.1
26+
xcode: Xcode_15.1
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
4646
- os: macos-12
4747
xcode: Xcode_14.2
4848
- os: macos-13
49-
xcode: Xcode_15.0.1
49+
xcode: Xcode_15.1
5050
runs-on: ${{ matrix.os }}
5151
steps:
5252
- uses: actions/checkout@v4
@@ -65,7 +65,7 @@ jobs:
6565
- uses: actions/checkout@v4
6666
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6767
with:
68-
cache_key: ${{ matrix.os }}
68+
cache_key: catalyst${{ matrix.os }}
6969
- uses: ruby/setup-ruby@v1
7070
- name: Setup Bundler
7171
run: scripts/setup_bundler.sh

‎.github/workflows/crashlytics.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ jobs:
2929
include:
3030
- os: macos-12
3131
xcode: Xcode_14.2
32-
tests:
33-
# Flaky tests on CI
34-
- os: macos-13
35-
xcode: Xcode_15.0.1
3632
tests: --skip-tests
33+
- os: macos-13
34+
xcode: Xcode_15.1
35+
tests:
3736
runs-on: ${{ matrix.os }}
3837
steps:
3938
- uses: actions/checkout@v4
@@ -58,13 +57,13 @@ jobs:
5857
- os: macos-12
5958
xcode: Xcode_14.2
6059
- os: macos-13
61-
xcode: Xcode_15.0.1
60+
xcode: Xcode_15.1
6261
runs-on: ${{ matrix.os }}
6362
steps:
6463
- uses: actions/checkout@v4
6564
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
6665
with:
67-
cache_key: ${{ matrix.os }}
66+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
6867
- name: Xcode
6968
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
7069
- name: Initialize xcodebuild
@@ -82,7 +81,7 @@ jobs:
8281
- uses: actions/checkout@v4
8382
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
8483
with:
85-
cache_key: ${{ matrix.os }}
84+
cache_key: catalyst${{ matrix.os }}
8685
- uses: ruby/setup-ruby@v1
8786
- name: Setup Bundler
8887
run: scripts/setup_bundler.sh

‎.github/workflows/database.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
include:
3232
- os: macos-12
3333
xcode: Xcode_14.2
34-
tests: --test-specs=unit
35-
- os: macos-13
36-
xcode: Xcode_15.0.1
3734
tests: --skip-tests
35+
- os: macos-13
36+
xcode: Xcode_15.1
37+
tests: --test-specs=unit
3838
runs-on: ${{ matrix.os }}
3939
steps:
4040
- uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v4
5555
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
5656
with:
57-
cache_key: ${{ matrix.os }}
57+
cache_key: integration${{ matrix.os }}
5858
- uses: ruby/setup-ruby@v1
5959
- name: Setup Bundler
6060
run: scripts/setup_bundler.sh
@@ -75,13 +75,13 @@ jobs:
7575
- os: macos-12
7676
xcode: Xcode_14.2
7777
- os: macos-13
78-
xcode: Xcode_15.0.1
78+
xcode: Xcode_15.1
7979
runs-on: ${{ matrix.os }}
8080
steps:
8181
- uses: actions/checkout@v4
8282
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
8383
with:
84-
cache_key: ${{ matrix.os }}
84+
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
8585
- name: Xcode
8686
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
8787
- name: Initialize xcodebuild
@@ -99,7 +99,7 @@ jobs:
9999
- uses: actions/checkout@v4
100100
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
101101
with:
102-
cache_key: ${{ matrix.os }}
102+
cache_key: catalyst${{ matrix.os }}
103103
- uses: ruby/setup-ruby@v1
104104
- name: Setup Bundler
105105
run: scripts/setup_bundler.sh

0 commit comments

Comments
 (0)