Skip to content

Commit 33ec247

Browse files
committed
ci: passing swift CI
1 parent cd0421c commit 33ec247

File tree

2 files changed

+29
-40
lines changed

2 files changed

+29
-40
lines changed

.github/workflows/ci_cd.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ jobs:
6060
- id: set_ffi_packages
6161
run: echo 'ffi_packages=["algokit_transact"]' >> $GITHUB_OUTPUT
6262

63-
python_uniffi_ci_cd:
64-
needs:
65-
- setup
66-
uses: ./.github/workflows/python_uniffi_ci_cd.yml
67-
strategy:
68-
matrix:
69-
crate: ${{ fromJSON(needs.setup.outputs.ffi_packages) }}
70-
with:
71-
crate: ${{ matrix.crate }}
72-
release: ${{ github.event_name == 'push' }}
73-
secrets:
74-
BOT_ID: ${{ secrets.BOT_ID }}
75-
BOT_SK: ${{ secrets.BOT_SK }}
76-
deploy_docs:
77-
# Only run on pushes to main (not on PRs)
78-
if: github.event_name == 'push'
79-
uses: ./.github/workflows/deploy_docs.yml
63+
# python_uniffi_ci_cd:
64+
# needs:
65+
# - setup
66+
# uses: ./.github/workflows/python_uniffi_ci_cd.yml
67+
# strategy:
68+
# matrix:
69+
# crate: ${{ fromJSON(needs.setup.outputs.ffi_packages) }}
70+
# with:
71+
# crate: ${{ matrix.crate }}
72+
# release: ${{ github.event_name == 'push' }}
73+
# secrets:
74+
# BOT_ID: ${{ secrets.BOT_ID }}
75+
# BOT_SK: ${{ secrets.BOT_SK }}
76+
# deploy_docs:
77+
# # Only run on pushes to main (not on PRs)
78+
# if: github.event_name == 'push'
79+
# uses: ./.github/workflows/deploy_docs.yml

.github/workflows/swift_ci.yml

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
name: Swift CI
22

33
on:
4-
# Temporarily disable automatic CI for swift while we focus on Python and TS
5-
# push:
6-
# branches:
7-
# - main
8-
# tags:
9-
# - "*"
10-
# pull_request:
11-
# branches:
12-
# - main
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- "*"
9+
pull_request:
10+
branches:
11+
- main
1312
workflow_dispatch:
1413

1514
permissions:
@@ -31,24 +30,14 @@ jobs:
3130
with:
3231
toolchain: 1.85.0
3332
targets: aarch64-apple-ios, x86_64-apple-ios, aarch64-apple-ios-sim, x86_64-apple-ios, aarch64-apple-ios-macabi, x86_64-apple-ios-macabi, aarch64-apple-darwin, x86_64-apple-darwin
34-
- uses: oven-sh/setup-bun@v2
35-
with:
36-
bun-version: latest
37-
- name: Setup Xcode
38-
uses: mxcl/xcodebuild@v3
39-
with:
40-
swift: ^6
41-
action: none
42-
platform: macOS
43-
- name: Install iOS Simulator
44-
run: xcodebuild -downloadPlatform iOS
4533
- name: Build
46-
run: bun scripts/build ${{ env.CRATE }} swift
34+
run: cargo pkg ${{ env.CRATE }} swift
35+
4736
# Ideally we'd use a matrix for the platforms, but due to the limitations of Mac runners on GitHub it's probably better to just have a single job with multiple steps
48-
- name: Test (macOS)
49-
run: cd packages/swift/${{ env.PACKAGE }} && xcodebuild -scheme ${{ env.PACKAGE }} test -destination "platform=macOS"
5037
- name: Test (iOS)
5138
run: cd packages/swift/${{ env.PACKAGE }} && xcodebuild -scheme ${{ env.PACKAGE }} test -destination "platform=iOS Simulator,name=iPhone 16,OS=latest"
39+
- name: Test (macOS)
40+
run: cd packages/swift/${{ env.PACKAGE }} && xcodebuild -scheme ${{ env.PACKAGE }} test -destination "platform=macOS"
5241
- name: Test (Catalyst)
5342
run: cd packages/swift/${{ env.PACKAGE }} && xcodebuild -scheme ${{ env.PACKAGE }} test -destination "platform=macOS,variant=Mac Catalyst"
5443
- name: Commit Package

0 commit comments

Comments
 (0)