Skip to content

Commit f03fefc

Browse files
bok-bok-
authored
Merge branch 'main' into william-lumley/fix-typo
2 parents 05527e6 + 8feeeb2 commit f03fefc

File tree

126 files changed

+8508
-4106
lines changed

Some content is hidden

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

126 files changed

+8508
-4106
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ on:
99
- '**/*.swift'
1010

1111
env:
12-
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
12+
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
1313

1414
jobs:
1515
BuildWebsite:
1616
name: "Build Docs"
17-
runs-on: macos-11.0
17+
runs-on: macos-latest
1818
steps:
1919
- name: 🛒 Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121

2222
- name: 👷 Build Website
2323
run: .github/scripts/generate-docs.sh

‎.github/workflows/documentation-coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: 🛒 Checkout
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: 🧱 Install dependencies
2727
run: sudo apt-get install -y jq

‎.github/workflows/ios-tests.yml‎

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66
pull_request:
77
branches: [ main ]
8-
8+
99
jobs:
1010
check-changes:
1111
name: Check for Changes
@@ -14,7 +14,7 @@ jobs:
1414
changed: ${{ steps.filter.outputs.changed }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -23,66 +23,35 @@ jobs:
2323
- '.github/workflows/ios-tests.yml'
2424
- '**/*.swift'
2525
26-
#####################
27-
# macOS 11 Versions #
28-
#####################
29-
30-
build-ios-macos-11-matrix:
31-
name: iOS Metrix - macOS 11
32-
runs-on: macos-11.0
33-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
34-
needs: check-changes
35-
strategy:
36-
matrix:
37-
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
38-
39-
env:
40-
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
41-
42-
steps:
43-
- name: Checkout
44-
uses: actions/checkout@v2
45-
- name: Build and Test
46-
run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=iOS Simulator,name=iPhone 8"
47-
48-
build-ios-macos-11:
49-
runs-on: ubuntu-latest
50-
name: iOS Tests - macOS 11
51-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
52-
needs: build-ios-macos-11-matrix
53-
steps:
54-
- name: Check build matrix status
55-
if: ${{ needs.build-ios-macos-11-matrix.result == 'failure' }}
56-
run: exit 1
57-
58-
#####################
59-
# macOS 12 Versions #
60-
#####################
61-
62-
build-ios-macos-12-matrix:
63-
name: iOS Matrix - macOS 12
64-
runs-on: macos-12
26+
build-ios-matrix:
27+
name: iOS Matrix
6528
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
6629
needs: check-changes
6730
strategy:
6831
matrix:
69-
xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
32+
xcode: [ "15.4", "16.0" ]
33+
os: [ macos-14 ]
34+
runs-on: ${{ matrix.os }}
7035

7136
env:
7237
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
7338

7439
steps:
7540
- name: Checkout
76-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
7742
- name: Build and Test
78-
run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=iOS Simulator,name=iPhone 8"
43+
run: |
44+
set -o pipefail && \
45+
NSUnbufferedIO=YES \
46+
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 15" \
47+
| xcbeautify --renderer github-actions
7948
80-
build-ios-macos-12:
49+
build-ios:
8150
runs-on: ubuntu-latest
82-
name: iOS Tests - macOS 12
51+
name: iOS Tests
8352
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
84-
needs: build-ios-macos-12-matrix
53+
needs: build-ios-matrix
8554
steps:
8655
- name: Check build matrix status
87-
if: ${{ needs.build-ios-macos-12-matrix.result == 'failure' }}
56+
if: ${{ needs.build-ios-matrix.result == 'failure' }}
8857
run: exit 1

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
filters: |
2020
changed:
2121
- '.github/workflows/lint.yml'
22-
- '..swiftformat'
22+
- '.swiftformat'
2323
- '**/*.swift'
2424
2525
Lint:

‎.github/workflows/linux-tests.yml‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changed: ${{ steps.filter.outputs.changed }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -34,24 +34,16 @@ jobs:
3434
needs: check-changes
3535
strategy:
3636
matrix:
37-
swift: [ "5.2.5", "5.3.3", "5.4.3", "5.5.3", "5.6.3", "5.7.3" ]
38-
os: [ amazonlinux2, bionic, centos7, focal, jammy ]
37+
swift: [ "swift:5.10.1", "swiftlang/swift:nightly-6.0" ]
38+
os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ]
3939
exclude:
40-
- swift: 5.2.5
41-
os: jammy
42-
- swift: 5.3.3
43-
os: jammy
44-
- swift: 5.4.3
45-
os: jammy
46-
- swift: 5.5.3
47-
os: jammy
48-
- swift: 5.6.3
49-
os: jammy
50-
- swift: 5.7.3
51-
os: centos7
40+
- swift: "swiftlang/swift:nightly-6.0"
41+
os: "mantic"
42+
- swift: "swiftlang/swift:nightly-6.0"
43+
os: "noble"
5244

5345
container:
54-
image: swift:${{ matrix.swift }}-${{ matrix.os }}
46+
image: ${{ matrix.swift }}-${{ matrix.os }}
5547

5648
steps:
5749
- name: Checkout

‎.github/workflows/macos-tests.yml‎

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changed: ${{ steps.filter.outputs.changed }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -23,66 +23,35 @@ jobs:
2323
- '.github/workflows/macos-tests.yml'
2424
- '**/*.swift'
2525
26-
############
27-
# macOS 11 #
28-
############
29-
30-
build-macos-macos-11-matrix:
31-
name: macOS Matrix - macOS 11
32-
runs-on: macos-11.0
26+
build-macos-matrix:
27+
name: macOS Matrix
3328
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
3429
needs: check-changes
3530
strategy:
3631
matrix:
37-
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
32+
xcode: [ "15.4", "16.0" ]
33+
os: [ macos-14 ]
34+
runs-on: ${{ matrix.os }}
3835

3936
env:
4037
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
4138

4239
steps:
4340
- name: Checkout
44-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
4542
- name: Build and Test
46-
run: swift test
47-
48-
build-macos-macos-11:
49-
runs-on: ubuntu-latest
50-
name: macOS Tests - macOS 11
51-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
52-
needs: build-macos-macos-11-matrix
53-
steps:
54-
- name: Check build matrix status
55-
if: ${{ needs.build-macos-macos-11-matrix.result == 'failure' }}
56-
run: exit 1
57-
58-
############
59-
# macOS 12 #
60-
############
43+
run: |
44+
set -o pipefail && \
45+
NSUnbufferedIO=YES \
46+
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=macOS,name=My Mac" \
47+
| xcbeautify --renderer github-actions
6148
62-
build-macos-macos-12-matrix:
63-
name: macOS Matrix - macOS 12
64-
runs-on: macos-12
65-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
66-
needs: check-changes
67-
strategy:
68-
matrix:
69-
xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
70-
71-
env:
72-
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
73-
74-
steps:
75-
- name: Checkout
76-
uses: actions/checkout@v2
77-
- name: Build and Test
78-
run: swift
79-
80-
build-macos-macos-12:
49+
build-macos:
8150
runs-on: ubuntu-latest
82-
name: macOS Tests - macOS 12
51+
name: macOS Tests
8352
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
84-
needs: build-macos-macos-12-matrix
53+
needs: build-macos-matrix
8554
steps:
8655
- name: Check build matrix status
87-
if: ${{ needs.build-macos-macos-12-matrix.result == 'failure' }}
56+
if: ${{ needs.build-macos-matrix.result == 'failure' }}
8857
run: exit 1

‎.github/workflows/tvos-tests.yml‎

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
changed: ${{ steps.filter.outputs.changed }}
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -23,66 +23,35 @@ jobs:
2323
- '.github/workflows/tvos-tests.yml'
2424
- '**/*.swift'
2525
26-
#####################
27-
# macOS 11 Versions #
28-
#####################
29-
30-
build-tvos-macos-11-matrix:
31-
name: tvOS Matrix - macOS 11
32-
runs-on: macos-11.0
33-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
34-
needs: check-changes
35-
strategy:
36-
matrix:
37-
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2.1" ]
38-
39-
env:
40-
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
41-
42-
steps:
43-
- name: Checkout
44-
uses: actions/checkout@v2
45-
- name: Build and Test
46-
run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=tvOS Simulator,name=Apple TV 4K"
47-
48-
build-tvos-macos-11:
49-
runs-on: ubuntu-latest
50-
name: tvOS Tests - macOS 11
51-
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
52-
needs: build-tvos-macos-11-matrix
53-
steps:
54-
- name: Check build matrix status
55-
if: ${{ needs.build-tvos-macos-11-matrix.result == 'failure' }}
56-
run: exit 1
57-
58-
#####################
59-
# macOS 12 Versions #
60-
#####################
61-
62-
build-tvos-macos-12-matrix:
63-
name: tvOS Matrix - macOS 12
64-
runs-on: macos-12
26+
build-tvos-matrix:
27+
name: tvOS Matrix
6528
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
6629
needs: check-changes
6730
strategy:
6831
matrix:
69-
xcode: [ "13.1", "13.2.1", "13.3.1", "13.4.1", "14.0.1", "14.1", "14.2" ]
32+
xcode: [ "15.4", "16.0" ]
33+
os: [ macos-14 ]
34+
runs-on: ${{ matrix.os }}
7035

7136
env:
7237
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
7338

7439
steps:
7540
- name: Checkout
76-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
7742
- name: Build and Test
78-
run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=tvOS Simulator,name=Apple TV 4K (2nd generation)"
43+
run: |
44+
set -o pipefail && \
45+
NSUnbufferedIO=YES \
46+
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=tvOS Simulator,name=Apple TV 4K (3rd generation)" \
47+
| xcbeautify --renderer github-actions
7948
80-
build-tvos-macos-12:
49+
build-tvos:
8150
runs-on: ubuntu-latest
82-
name: tvOS Tests - macOS 12
51+
name: tvOS Tests
8352
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
84-
needs: build-tvos-macos-12-matrix
53+
needs: build-tvos-matrix
8554
steps:
8655
- name: Check build matrix status
87-
if: ${{ needs.build-tvos-macos-12-matrix.result == 'failure' }}
56+
if: ${{ needs.build-tvos-matrix.result == 'failure' }}
8857
run: exit 1

0 commit comments

Comments
 (0)