Skip to content

Commit 4aa91a5

Browse files
committed
Fix generate_xcframework.py bug that broke loop instead of continuing when preserving xcarchives.
1 parent 332ee69 commit 4aa91a5

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

.github/actions/archive-framework/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ runs:
1717
1818
LDK_C_BINDINGS_BINARY_DIRECTORY="" \
1919
xcodebuild archive \
20-
-scheme 'LDKFramework' \
2120
-project 'LDKFramework/LDKFramework.xcodeproj' \
22-
-destination '${{ inputs.destination }}' \
21+
-scheme 'LDKFramework' \
22+
-destination 'generic/platform=${{ inputs.destination }}' \
2323
-archivePath "/Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/${{ inputs.human_readable_platform }}/${{ inputs.human_readable_platform }}" \
2424
ENABLE_BITCODE=NO \
25-
CLANG_ADDRESS_SANITIZER=NO CLANG_ADDRESS_SANITIZER_ALLOW_ERROR_RECOVERY=NO CLANG_ADDRESS_SANITIZER_USE_AFTER_SCOPE=NO \
25+
EXCLUDED_ARCHS="i386 armv7" \
2626
SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
2727
LDK_C_BINDINGS_BASE="${LDK_C_BINDINGS_BASE}" \
2828
LDK_C_BINDINGS_BINARY_DIRECTORY="" \

.github/workflows/build-xcframework-parallel-archives.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
configuration:
24-
- destination: generic/platform=iOS
25-
human_readable_platform: 'iphoneos'
26-
- destination: platform=iOS Simulator,OS=15.2,name=iPhone 13 Pro
24+
- destination: 'iOS Simulator'
2725
human_readable_platform: 'iphonesimulator'
28-
- destination: generic/platform=OS X
26+
- destination: 'iOS'
27+
human_readable_platform: 'iphoneos'
28+
- destination: 'OS X'
2929
human_readable_platform: 'macosx'
30-
- destination: platform=macOS,variant=Mac Catalyst,arch=x86_64
30+
- destination: 'macOS,variant=Mac Catalyst'
3131
human_readable_platform: 'catalyst'
3232
env:
3333
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
@@ -84,5 +84,5 @@ jobs:
8484
- name: Upload Framework Artifact
8585
uses: actions/upload-artifact@v3
8686
with:
87-
name: LDKFramework.xcframework.zip
87+
name: LDKFramework
8888
path: LDKFramework.xcframework.zip

.github/workflows/build-xcframework-parallel-libldk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ jobs:
9898
- name: Upload Framework Artifact
9999
uses: actions/upload-artifact@v3
100100
with:
101-
name: LDKFramework.xcframework.zip
101+
name: LDKFramework
102102
path: LDKFramework.xcframework.zip

.github/workflows/build-xcframework-sequential.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ jobs:
3737
- name: Upload Framework Artifact
3838
uses: actions/upload-artifact@v3
3939
with:
40-
name: LDKFramework.xcframework.zip
40+
name: LDKFramework
4141
path: LDKFramework.xcframework.zip

src/scripts/generate_xcframework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def run(config: ScriptConfig):
6565

6666
if config.PRESERVE_XCARCHIVES:
6767
# we don't regenerate any new xcarchives, and simply reuse the existing ones
68-
break
68+
continue
6969

7070
# create clean derived data directory
7171
if os.path.exists(derived_data_directory):

0 commit comments

Comments
 (0)