Skip to content

Commit 3b76313

Browse files
committed
Change CI to use Swiftly
1 parent c281f54 commit 3b76313

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ jobs:
2323
lint:
2424
name: Lint & Format Check
2525
runs-on: macOS-26
26-
env:
27-
DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer"
2826
steps:
2927
- name: Checkout
3028
uses: actions/checkout@v6
31-
- name: Swift Version
32-
run: xcrun swift --version
3329
- name: Install SwiftLint
3430
run: brew install swiftlint --quiet
3531
- name: Install swift-format
@@ -42,29 +38,36 @@ jobs:
4238
name: ${{ matrix.name }}
4339
runs-on: ${{ matrix.runsOn }}
4440
needs: lint
45-
env:
46-
DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer"
4741
strategy:
4842
matrix:
4943
include:
50-
- xcode: "Xcode_26.0"
51-
runsOn: macOS-26
44+
- runsOn: macOS-26
5245
name: "macOS 26, SPM 6.2.0 Test"
5346
steps:
5447
- uses: actions/checkout@v4
48+
- name: Install Swiftly And Swift
49+
run: |
50+
curl -L https://download.swift.org/swiftly/darwin/swiftly.pkg > swiftly.pkg
51+
installer -pkg swiftly.pkg -target CurrentUserHomeDirectory
52+
53+
~/.swiftly/bin/swiftly init
54+
55+
swiftly install --use --assume-yes
56+
swiftly link --assume-yes
57+
hash -r
5558
- name: Swift Version
56-
run: xcrun swift --version
59+
run: which swift && swift --version
5760
- name: Brew install tools
58-
run: brew install xcbeautify jemalloc --quiet
61+
run: brew install xcbeautify --quiet
5962
- name: Run Tests
6063
run: |
6164
defaults write com.apple.dt.Xcode IDEPackageEnablePrebuilts YES
6265
63-
set -o pipefail && \
64-
xcodebuild test \
65-
-scheme BinaryParseKit \
66-
-destination 'platform=macOS' \
67-
-skipMacroValidation | xcbeautify --renderer github-actions
66+
# set -o pipefail && \
67+
# xcodebuild test \
68+
# -scheme BinaryParseKit \
69+
# -destination 'platform=macOS' \
70+
# -skipMacroValidation | xcbeautify --renderer github-actions
6871
6972
# https://github.com/swiftlang/swift-package-manager/issues/9163
70-
# set -o pipefail && xcrun swift test -c debug --enable-code-coverage --xunit-output $TEST_RESULTS_DIR/xunit.xml 2>&1 | xcbeautify --renderer github-actions
73+
set -o pipefail && swift test | xcbeautify --renderer github-actions

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2
1+
6.2.3

0 commit comments

Comments
 (0)