Skip to content

Commit 6fbd643

Browse files
SomeRandomiOSDevSomeRandomiOSDev
authored
Merge pull request #30 from SomeRandomiOSDev/bulk-updates
Bulk updates
2 parents e12b478 + 7d855da commit 6fbd643

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1330
-853
lines changed

‎.github/workflows/carthage.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,26 @@ on:
2424

2525
jobs:
2626
build:
27+
strategy:
28+
matrix:
29+
os: [macOS-13]
30+
xcode: ['15.0']
31+
2732
name: Build
28-
runs-on: macOS-11
33+
runs-on: ${{ matrix.os }}
2934
env:
3035
LOGSDIR: /tmp/.cborcoding.carthage/Logs
3136

3237
steps:
38+
- name: Select Xcode Version
39+
uses: maxim-lobanov/setup-xcode@v1
40+
with:
41+
xcode-version: ${{ matrix.xcode }}
42+
3343
- name: Checkout Code
34-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
45+
with:
46+
submodules: recursive
3547

3648
- name: Setup Environment
3749
run: |
@@ -56,7 +68,7 @@ jobs:
5668
./scripts/carthage.sh update --log-path "$LOGSDIR/Build.log"
5769
5870
- name: Upload Logs
59-
uses: actions/upload-artifact@v2
71+
uses: actions/upload-artifact@v3
6072
if: always()
6173
with:
6274
name: BuildLog

‎.github/workflows/cocoapods.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,26 @@ jobs:
2626
strategy:
2727
matrix:
2828
linttype: [Dynamic, Static]
29+
os: [macOS-13]
30+
xcode: ['15.0']
31+
2932

3033
name: Lint
31-
runs-on: macOS-11
34+
runs-on: ${{ matrix.os }}
3235
env:
3336
LOGSDIR: /tmp/.cborcoding.cocoapods/Logs/${{ matrix.linttype }}
3437
LINT_TYPE: ${{ matrix.linttype }}
3538

3639
steps:
40+
- name: Select Xcode Version
41+
uses: maxim-lobanov/setup-xcode@v1
42+
with:
43+
xcode-version: ${{ matrix.xcode }}
44+
3745
- name: Checkout Code
38-
uses: actions/checkout@v2
46+
uses: actions/checkout@v4
47+
with:
48+
submodules: recursive
3949

4050
- name: Setup Cocoapods
4151
uses: maxim-lobanov/setup-cocoapods@v1
@@ -55,7 +65,7 @@ jobs:
5565
fi
5666
5767
- name: Upload Logs
58-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v3
5969
if: always()
6070
with:
6171
name: ${{ matrix.linttype }}Logs

‎.github/workflows/documentation.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,37 @@ on:
1616

1717
jobs:
1818
build:
19+
strategy:
20+
matrix:
21+
os: [macOS-13]
22+
xcode: ['15.0']
23+
1924
name: Build Documentation
20-
runs-on: macOS-11
25+
runs-on: ${{ matrix.os }}
2126
env:
2227
LOGSDIR: /tmp/.cborcoding.documentation/Logs
2328

2429
steps:
30+
- name: Select Xcode Version
31+
uses: maxim-lobanov/setup-xcode@v1
32+
with:
33+
xcode-version: ${{ matrix.xcode }}
34+
2535
- name: Checkout Code
26-
uses: actions/checkout@v2
36+
uses: actions/checkout@v4
37+
with:
38+
submodules: recursive
2739

2840
- name: Setup Environment
2941
run: |
3042
mkdir -p "$LOGSDIR"
3143
3244
- name: Build Documentation
3345
run: |
34-
xcodebuild docbuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS" SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build.log"
46+
xcodebuild docbuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS" SKIP_SWIFTLINT=YES 2>&1 | tee "$LOGSDIR/build.log"
3547
3648
- name: Upload Logs
37-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v3
3850
if: always()
3951
with:
4052
name: Logs

‎.github/workflows/publish-cocoapods.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,27 @@ on:
88

99
jobs:
1010
publish:
11+
strategy:
12+
matrix:
13+
os: [macOS-13]
14+
xcode: ['15.0']
15+
1116
name: Publish CocoaPods
12-
runs-on: macOS-11
17+
runs-on: ${{ matrix.os }}
1318
env:
1419
LOGSDIR: /tmp/.cborcoding.cocoapods/Logs
1520
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
1621

1722
steps:
23+
- name: Select Xcode Version
24+
uses: maxim-lobanov/setup-xcode@v1
25+
with:
26+
xcode-version: ${{ matrix.xcode }}
27+
1828
- name: Checkout Code
19-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
30+
with:
31+
submodules: recursive
2032

2133
- name: Setup CocoaPods
2234
uses: maxim-lobanov/setup-cocoapods@v1
@@ -32,7 +44,7 @@ jobs:
3244
pod trunk push CBORCoding.podspec --verbose 2>&1 | tee "$LOGSDIR/CocoaPods.log"
3345
3446
- name: Upload Logs
35-
uses: actions/upload-artifact@v2
47+
uses: actions/upload-artifact@v3
3648
if: always()
3749
with:
3850
name: Logs

‎.github/workflows/swift-package.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,25 @@ jobs:
2424
build:
2525
strategy:
2626
matrix:
27-
os: [macOS-11, ubuntu-latest]
27+
os: [macOS-13, ubuntu-latest]
28+
xcode: ['15.0']
2829

2930
name: Build
3031
runs-on: ${{ matrix.os }}
3132
env:
3233
LOGSDIR: /tmp/.cborcoding.swiftpm/Logs/Build
3334

3435
steps:
36+
- name: Select Xcode Version
37+
if: ${{ runner.os == 'macOS' }}
38+
uses: maxim-lobanov/setup-xcode@v1
39+
with:
40+
xcode-version: ${{ matrix.xcode }}
41+
3542
- name: Checkout Code
36-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
44+
with:
45+
submodules: recursive
3746

3847
- name: Setup Environment
3948
run: |
@@ -45,7 +54,7 @@ jobs:
4554
swift build --verbose | tee -a "$LOGSDIR/Build.log"
4655
4756
- name: Upload Logs
48-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v3
4958
if: always()
5059
with:
5160
name: BuildLogs-${{ runner.os }}
@@ -54,7 +63,8 @@ jobs:
5463
test:
5564
strategy:
5665
matrix:
57-
os: [macOS-11, ubuntu-latest]
66+
os: [macOS-13, ubuntu-latest]
67+
xcode: ['15.0']
5868

5969
name: Test
6070
runs-on: ${{ matrix.os }}
@@ -63,8 +73,16 @@ jobs:
6373
LOGSDIR: /tmp/.cborcoding.swiftpm/Logs/Test
6474

6575
steps:
76+
- name: Select Xcode Version
77+
if: ${{ runner.os == 'macOS' }}
78+
uses: maxim-lobanov/setup-xcode@v1
79+
with:
80+
xcode-version: ${{ matrix.xcode }}
81+
6682
- name: Checkout Code
67-
uses: actions/checkout@v2
83+
uses: actions/checkout@v4
84+
with:
85+
submodules: recursive
6886

6987
- name: Setup Environment
7088
run: |
@@ -88,7 +106,7 @@ jobs:
88106
verbose: true
89107

90108
- name: Upload Logs
91-
uses: actions/upload-artifact@v2
109+
uses: actions/upload-artifact@v3
92110
if: always()
93111
with:
94112
name: TestLogs-${{ runner.os }}

‎.github/workflows/swiftlint.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,24 @@ on:
1616

1717
jobs:
1818
build:
19+
strategy:
20+
matrix:
21+
os: [macOS-13]
22+
xcode: ['15.0']
23+
1924
name: Run SwiftLint
20-
runs-on: macOS-11
25+
runs-on: ${{ matrix.os }}
2126

2227
steps:
28+
- name: Select Xcode Version
29+
uses: maxim-lobanov/setup-xcode@v1
30+
with:
31+
xcode-version: ${{ matrix.xcode }}
32+
2333
- name: Checkout Code
24-
uses: actions/checkout@v2
34+
uses: actions/checkout@v4
35+
with:
36+
submodules: recursive
2537

2638
- name: Run SwiftLint
2739
run: |

‎.github/workflows/upload-assets.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,26 @@ on:
88

99
jobs:
1010
xcframework:
11+
strategy:
12+
matrix:
13+
os: [macOS-13]
14+
xcode: ['15.0']
15+
1116
name: Upload XCFramework Assets
12-
runs-on: macOS-11
17+
runs-on: ${{ matrix.os }}
1318
env:
1419
TMPDIR: /tmp/.cborcoding.assets-xcframework.build
1520

1621
steps:
22+
- name: Select Xcode Version
23+
uses: maxim-lobanov/setup-xcode@v1
24+
with:
25+
xcode-version: ${{ matrix.xcode }}
26+
1727
- name: Checkout Code
18-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
29+
with:
30+
submodules: recursive
1931

2032
- name: Setup Environment
2133
run: |
@@ -57,7 +69,7 @@ jobs:
5769
asset_content_type: application/gzip
5870

5971
- name: Upload Logs
60-
uses: actions/upload-artifact@v2
72+
uses: actions/upload-artifact@v3
6173
if: always()
6274
with:
6375
name: XCFrameworkLogs
@@ -66,14 +78,26 @@ jobs:
6678

6779

6880
documentation:
81+
strategy:
82+
matrix:
83+
os: [macOS-13]
84+
xcode: ['15.0']
85+
6986
name: Upload Documentation Assets
70-
runs-on: macOS-11
87+
runs-on: ${{ matrix.os }}
7188
env:
7289
TMPDIR: /tmp/.cborcoding.assets-documentation.build
7390

7491
steps:
92+
- name: Select Xcode Version
93+
uses: maxim-lobanov/setup-xcode@v1
94+
with:
95+
xcode-version: ${{ matrix.xcode }}
96+
7597
- name: Checkout Code
76-
uses: actions/checkout@v2
98+
uses: actions/checkout@v4
99+
with:
100+
submodules: recursive
77101

78102
- name: Setup Environment
79103
run: |
@@ -82,7 +106,7 @@ jobs:
82106
83107
- name: Build
84108
run: |
85-
xcodebuild docbuild -project "CBORCoding.xcodeproj" -scheme "CBORCoding" -destination "generic/platform=iOS" -derivedDataPath "${TMPDIR}/.docbuild" 2>&1 | tee "${TMPDIR}/Logs/Build.log"
109+
xcodebuild docbuild -workspace "CBORCoding.xcworkspace" -scheme "CBORCoding" -destination "generic/platform=iOS" -derivedDataPath "${TMPDIR}/.docbuild" 2>&1 | tee "${TMPDIR}/Logs/Build.log"
86110
87111
DOCC_ARCHIVE="$(find "${TMPDIR}/.docbuild" -type d -name "CBORCoding.doccarchive")"
88112
mv "${DOCC_ARCHIVE%/}" "${TMPDIR}/Output/CBORCoding.doccarchive"
@@ -118,7 +142,7 @@ jobs:
118142
asset_content_type: application/gzip
119143

120144
- name: Upload Logs
121-
uses: actions/upload-artifact@v2
145+
uses: actions/upload-artifact@v3
122146
if: always()
123147
with:
124148
name: DocumentationLogs

‎.github/workflows/xcframework.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,26 @@ on:
2525

2626
jobs:
2727
build:
28+
strategy:
29+
matrix:
30+
os: [macOS-13]
31+
xcode: ['15.0']
32+
2833
name: Build
29-
runs-on: macOS-11
34+
runs-on: ${{ matrix.os }}
3035
env:
3136
TMPDIR: /tmp/.cborcoding.xcframework.build
3237

3338
steps:
39+
- name: Select Xcode Version
40+
uses: maxim-lobanov/setup-xcode@v1
41+
with:
42+
xcode-version: ${{ matrix.xcode }}
43+
3444
- name: Checkout Code
35-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
46+
with:
47+
submodules: recursive
3648

3749
- name: Setup Environment
3850
run: |
@@ -44,7 +56,7 @@ jobs:
4456
./scripts/xcframework.sh --build-dir "${TMPDIR}" -- RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES
4557
4658
- name: Upload Logs
47-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v3
4860
if: always()
4961
with:
5062
name: BuildLogs

0 commit comments

Comments
 (0)