Skip to content

Commit 150ff1f

Browse files
committed
CI: Switch away from universal builds for macOS (broken) and switch Linux Swift actions (broken)
1 parent f969868 commit 150ff1f

2 files changed

Lines changed: 24 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,37 @@ jobs:
2222
curl -o swift-bundler -L https://github.com/stackotter/swift-bundler/releases/download/v2.0.4/swift-bundler
2323
chmod +x ./swift-bundler
2424
cp ./swift-bundler /usr/local/bin
25-
- name: Build
25+
- name: Build arm64
26+
run: |
27+
./swift-bundler bundle -c release -o .
28+
plutil -insert MetalCaptureEnabled -bool YES DeltaClient.app/Contents/Info.plist
29+
mv DeltaClient.app DeltaClient-arm64.app
30+
- name: Build x86
2631
run: |
27-
./swift-bundler bundle -c release -o . -u
32+
./swift-bundler bundle -c release -o . --arch x86_64
2833
plutil -insert MetalCaptureEnabled -bool YES DeltaClient.app/Contents/Info.plist
29-
- name: Zip .app
30-
run: zip -r DeltaClient.zip DeltaClient.app
31-
- name: Upload artifact
34+
mv DeltaClient.app DeltaClient-x86_64.app
35+
- name: Zip .app (arm64)
36+
run: zip -r DeltaClient-arm64.zip DeltaClient-arm64.app
37+
- name: Zip .app (x86_64)
38+
run: zip -r DeltaClient-x86_64.zip DeltaClient-x86_64.app
39+
- name: Upload artifact (arm64)
40+
uses: actions/upload-artifact@v7
41+
with:
42+
name: DeltaClient-arm64
43+
path: ./DeltaClient-arm64.zip
44+
- name: Upload artifact (x86_64)
3245
uses: actions/upload-artifact@v7
3346
with:
34-
name: DeltaClient
35-
path: ./DeltaClient.zip
47+
name: DeltaClient-x86_64
48+
path: ./DeltaClient-x86_64.zip
3649
build-linux:
3750
runs-on: ubuntu-latest
3851
steps:
3952
- name: Setup Swift
40-
uses: swift-actions/setup-swift@v2
53+
uses: SwiftyLab/setup-swift@latest
4154
with:
42-
swift-version: 5.7
55+
swift-version: "5.7"
4356
- name: Checkout
4457
uses: actions/checkout@v6
4558
- name: Build

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Setup Swift
26-
uses: swift-actions/setup-swift@v2
26+
uses: SwiftyLab/setup-swift@latest
2727
with:
28-
swift-version: 5.7
28+
swift-version: "5.7"
2929
- name: Checkout
3030
uses: actions/checkout@v6
3131
- name: Test

0 commit comments

Comments
 (0)