Skip to content

Commit c631aa6

Browse files
dabrahamsdabrahams
committed
Merge branch 'main' of github.com:SomeRandomiOSDev/Half into nix-needless-import
2 parents bbe53bb + 28838ea commit c631aa6

30 files changed

+250
-6334
lines changed

‎.github/workflows/carthage.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,24 @@ on:
2121

2222
jobs:
2323
build:
24+
strategy:
25+
matrix:
26+
os: [macOS-13]
27+
xcode: ['15.0']
28+
2429
name: Build
25-
runs-on: macOS-11
30+
runs-on: ${{ matrix.os }}
2631
env:
2732
LOGSDIR: /tmp/.half.carthage/Logs
2833

2934
steps:
35+
- name: Select Xcode Version
36+
uses: maxim-lobanov/setup-xcode@v1
37+
with:
38+
xcode-version: ${{ matrix.xcode }}
39+
3040
- name: Checkout Code
31-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
3242

3343
- name: Setup Environment
3444
run: |
@@ -53,7 +63,7 @@ jobs:
5363
./scripts/carthage.sh update --log-path "$LOGSDIR/Build.log"
5464
5565
- name: Upload Logs
56-
uses: actions/upload-artifact@v2
66+
uses: actions/upload-artifact@v3
5767
if: always()
5868
with:
5969
name: BuildLog

‎.github/workflows/cocoapods.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,23 @@ jobs:
2323
strategy:
2424
matrix:
2525
linttype: [Dynamic, Static]
26+
os: [macOS-13]
27+
xcode: ['15.0']
2628

2729
name: Lint
28-
runs-on: macOS-11
30+
runs-on: ${{ matrix.os }}
2931
env:
3032
LOGSDIR: /tmp/.half.cocoapods/Logs/${{ matrix.linttype }}
3133
LINT_TYPE: ${{ matrix.linttype }}
3234

3335
steps:
36+
- name: Select Xcode Version
37+
uses: maxim-lobanov/setup-xcode@v1
38+
with:
39+
xcode-version: ${{ matrix.xcode }}
40+
3441
- name: Checkout Code
35-
uses: actions/checkout@v2
42+
uses: actions/checkout@v4
3643

3744
- name: Setup Cocoapods
3845
uses: maxim-lobanov/setup-cocoapods@v1
@@ -52,7 +59,7 @@ jobs:
5259
fi
5360
5461
- name: Upload Logs
55-
uses: actions/upload-artifact@v2
62+
uses: actions/upload-artifact@v3
5663
if: always()
5764
with:
5865
name: ${{ matrix.linttype }}Logs

‎.github/workflows/documentation.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,24 @@ on:
1313

1414
jobs:
1515
build:
16+
strategy:
17+
matrix:
18+
os: [macOS-13]
19+
xcode: ['15.0']
20+
1621
name: Build Documentation
17-
runs-on: macOS-11
22+
runs-on: ${{ matrix.os }}
1823
env:
1924
LOGSDIR: /tmp/.half.documentation/Logs
2025

2126
steps:
27+
- name: Select Xcode Version
28+
uses: maxim-lobanov/setup-xcode@v1
29+
with:
30+
xcode-version: ${{ matrix.xcode }}
31+
2232
- name: Checkout Code
23-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
2434

2535
- name: Setup Environment
2636
run: |
@@ -31,7 +41,7 @@ jobs:
3141
xcodebuild docbuild -project "Half.xcodeproj" -scheme "Half" -destination "generic/platform=iOS Simulator" SKIP_SWIFTLINT=YES ARCHS="x86_64" 2>&1 | tee "$LOGSDIR/build.log"
3242
3343
- name: Upload Logs
34-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v3
3545
if: always()
3646
with:
3747
name: Logs

‎.github/workflows/publish-cocoapods.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,25 @@ on:
55

66
jobs:
77
publish:
8+
strategy:
9+
matrix:
10+
os: [macOS-13]
11+
xcode: ['15.0']
12+
813
name: Publish CocoaPods
9-
runs-on: macOS-11
14+
runs-on: ${{ matrix.os }}
1015
env:
1116
LOGSDIR: /tmp/.half.cocoapods/Logs
1217
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
1318

1419
steps:
20+
- name: Select Xcode Version
21+
uses: maxim-lobanov/setup-xcode@v1
22+
with:
23+
xcode-version: ${{ matrix.xcode }}
24+
1525
- name: Checkout Code
16-
uses: actions/checkout@v2
26+
uses: actions/checkout@v4
1727

1828
- name: Setup CocoaPods
1929
uses: maxim-lobanov/setup-cocoapods@v1
@@ -29,7 +39,7 @@ jobs:
2939
pod trunk push Half.podspec --verbose 2>&1 | tee "$LOGSDIR/CocoaPods.log"
3040
3141
- name: Upload Logs
32-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v3
3343
if: always()
3444
with:
3545
name: Logs

‎.github/workflows/swift-package.yml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,23 @@ jobs:
2121
build:
2222
strategy:
2323
matrix:
24-
os: [macOS-11, ubuntu-latest]
24+
os: [macOS-13, ubuntu-latest]
25+
xcode: ['15.0']
2526

2627
name: Build
2728
runs-on: ${{ matrix.os }}
2829
env:
2930
LOGSDIR: /tmp/.half.swiftpm/Logs/Build
3031

3132
steps:
33+
- name: Select Xcode Version
34+
if: ${{ runner.os == 'macOS' }}
35+
uses: maxim-lobanov/setup-xcode@v1
36+
with:
37+
xcode-version: ${{ matrix.xcode }}
38+
3239
- name: Checkout Code
33-
uses: actions/checkout@v2
40+
uses: actions/checkout@v4
3441

3542
- name: Setup Environment
3643
run: |
@@ -42,7 +49,7 @@ jobs:
4249
swift build --verbose | tee -a "$LOGSDIR/Build.log"
4350
4451
- name: Upload Logs
45-
uses: actions/upload-artifact@v2
52+
uses: actions/upload-artifact@v3
4653
if: always()
4754
with:
4855
name: BuildLogs-${{ runner.os }}
@@ -51,7 +58,8 @@ jobs:
5158
test:
5259
strategy:
5360
matrix:
54-
os: [macOS-11, ubuntu-latest]
61+
os: [macOS-13, ubuntu-latest]
62+
xcode: ['15.0']
5563

5664
name: Test
5765
runs-on: ${{ matrix.os }}
@@ -60,8 +68,14 @@ jobs:
6068
LOGSDIR: /tmp/.half.swiftpm/Logs/Test
6169

6270
steps:
71+
- name: Select Xcode Version
72+
if: ${{ runner.os == 'macOS' }}
73+
uses: maxim-lobanov/setup-xcode@v1
74+
with:
75+
xcode-version: ${{ matrix.xcode }}
76+
6377
- name: Checkout Code
64-
uses: actions/checkout@v2
78+
uses: actions/checkout@v4
6579

6680
- name: Setup Environment
6781
run: |
@@ -85,7 +99,7 @@ jobs:
8599
verbose: true
86100

87101
- name: Upload Logs
88-
uses: actions/upload-artifact@v2
102+
uses: actions/upload-artifact@v3
89103
if: always()
90104
with:
91105
name: TestLogs-${{ runner.os }}

‎.github/workflows/swiftlint.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,22 @@ on:
1313

1414
jobs:
1515
build:
16+
strategy:
17+
matrix:
18+
os: [macOS-13]
19+
xcode: ['15.0']
20+
1621
name: Run SwiftLint
17-
runs-on: macOS-11
22+
runs-on: ${{ matrix.os }}
1823

1924
steps:
25+
- name: Select Xcode Version
26+
uses: maxim-lobanov/setup-xcode@v1
27+
with:
28+
xcode-version: ${{ matrix.xcode }}
29+
2030
- name: Checkout Code
21-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
2232

2333
- name: Run SwiftLint
2434
run: |

‎.github/workflows/upload-assets.yml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,24 @@ on:
55

66
jobs:
77
xcframework:
8+
strategy:
9+
matrix:
10+
os: [macOS-13]
11+
xcode: ['15.0']
12+
813
name: Upload XCFramework Assets
9-
runs-on: macOS-11
14+
runs-on: ${{ matrix.os }}
1015
env:
1116
TMPDIR: /tmp/.half.assets-xcframework.build
1217

1318
steps:
19+
- name: Select Xcode Version
20+
uses: maxim-lobanov/setup-xcode@v1
21+
with:
22+
xcode-version: ${{ matrix.xcode }}
23+
1424
- name: Checkout Code
15-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
1626

1727
- name: Setup Environment
1828
run: |
@@ -54,7 +64,7 @@ jobs:
5464
asset_content_type: application/gzip
5565

5666
- name: Upload Logs
57-
uses: actions/upload-artifact@v2
67+
uses: actions/upload-artifact@v3
5868
if: always()
5969
with:
6070
name: XCFrameworkLogs
@@ -63,14 +73,24 @@ jobs:
6373

6474

6575
documentation:
76+
strategy:
77+
matrix:
78+
os: [macOS-13]
79+
xcode: ['15.0']
80+
6681
name: Upload Documentation Assets
67-
runs-on: macOS-11
82+
runs-on: ${{ matrix.os }}
6883
env:
6984
TMPDIR: /tmp/.half.assets-documentation.build
7085

7186
steps:
87+
- name: Select Xcode Version
88+
uses: maxim-lobanov/setup-xcode@v1
89+
with:
90+
xcode-version: ${{ matrix.xcode }}
91+
7292
- name: Checkout Code
73-
uses: actions/checkout@v2
93+
uses: actions/checkout@v4
7494

7595
- name: Setup Environment
7696
run: |
@@ -115,7 +135,7 @@ jobs:
115135
asset_content_type: application/gzip
116136

117137
- name: Upload Logs
118-
uses: actions/upload-artifact@v2
138+
uses: actions/upload-artifact@v3
119139
if: always()
120140
with:
121141
name: DocumentationLogs

‎.github/workflows/xcframework.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,24 @@ on:
2222

2323
jobs:
2424
build:
25+
strategy:
26+
matrix:
27+
os: [macOS-13]
28+
xcode: ['15.0']
29+
2530
name: Build
26-
runs-on: macOS-11
31+
runs-on: ${{ matrix.os }}
2732
env:
2833
TMPDIR: /tmp/.half.xcframework.build
2934

3035
steps:
36+
- name: Select Xcode Version
37+
uses: maxim-lobanov/setup-xcode@v1
38+
with:
39+
xcode-version: ${{ matrix.xcode }}
40+
3141
- name: Checkout Code
32-
uses: actions/checkout@v2
42+
uses: actions/checkout@v4
3343

3444
- name: Setup Environment
3545
run: |
@@ -41,7 +51,7 @@ jobs:
4151
./scripts/xcframework.sh --build-dir "${TMPDIR}" -- RUN_DOCUMENTATION_COMPILER=NO SKIP_SWIFTLINT=YES
4252
4353
- name: Upload Logs
44-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v3
4555
if: always()
4656
with:
4757
name: BuildLogs

0 commit comments

Comments
 (0)