Skip to content

Commit decc4ba

Browse files
authored
chore: fix apple release (#1245)
* fix: apple build fixes * check before publish
1 parent 7b64ea4 commit decc4ba

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

.github/workflows/release.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,26 @@ on:
66
push:
77
branches: [main]
88
jobs:
9+
check-release:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
will-publish: ${{ steps.check.outputs.will-publish }}
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
- name: Check for pending changesets
17+
id: check
18+
run: |
19+
CHANGESETS=$(find .changeset -name "*.md" -not -name "README.md" | wc -l | tr -d ' ')
20+
if [ "$CHANGESETS" -eq 0 ]; then
21+
echo "will-publish=true" >> $GITHUB_OUTPUT
22+
else
23+
echo "will-publish=false" >> $GITHUB_OUTPUT
24+
fi
25+
926
build-android:
27+
needs: check-release
28+
if: needs.check-release.outputs.will-publish == 'true'
1029
runs-on: ubuntu-latest
1130
steps:
1231
- name: Checkout
@@ -26,6 +45,8 @@ jobs:
2645
path: packages/async-storage/android/local_repo
2746

2847
build-apple:
48+
needs: check-release
49+
if: needs.check-release.outputs.will-publish == 'true'
2950
runs-on: macos-latest
3051
steps:
3152
- name: Checkout
@@ -46,7 +67,8 @@ jobs:
4667

4768
release:
4869
runs-on: ubuntu-latest
49-
needs: [build-android, build-apple]
70+
needs: [check-release, build-android, build-apple]
71+
if: '!failure() && !cancelled()'
5072
steps:
5173
- name: Checkout
5274
uses: actions/checkout@v4
@@ -57,11 +79,13 @@ jobs:
5779
- name: Install dependencies
5880
run: yarn
5981
- name: Download Android artifacts
82+
if: needs.check-release.outputs.will-publish == 'true'
6083
uses: actions/download-artifact@v4
6184
with:
6285
name: android-artifacts
6386
path: packages/async-storage/android/local_repo
6487
- name: Download Apple artifacts
88+
if: needs.check-release.outputs.will-publish == 'true'
6589
uses: actions/download-artifact@v4
6690
with:
6791
name: apple-artifacts

scripts/build-native-lib.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ANDROID_OUTPUT_DIR="$MODULE_NAME/build"
1111
ANDROID_RN_OUTPUT_DIR="$RN_MODULE_DIR/android"
1212
ANDROID_PUBLISH_TASK="publishAndroidPublicationToLocalRepoRepository"
1313

14-
APPLE_BUILD_TASK="assembleSharedAsyncStorageXCFramework"
14+
APPLE_BUILD_TASK="assembleSharedAsyncStorageReleaseXCFramework"
1515
APPLE_OUTPUT_NAME="SharedAsyncStorage.xcframework"
1616
APPLE_OUTPUT_DIR="$MODULE_NAME/build/XCFrameworks/release"
1717
APPLE_RN_OUTPUT_DIR="$RN_MODULE_DIR/apple-frameworks"
@@ -57,10 +57,10 @@ build_apple() {
5757
# symlinks
5858
rm "$MAC_OS_FRAMEWORK/Headers" "$MAC_OS_FRAMEWORK/Modules" "$MAC_OS_FRAMEWORK/Resources" "$MAC_OS_FRAMEWORK/SharedAsyncStorage"
5959

60-
cp -r --copy-content "$MAC_OS_FRAMEWORK/Versions/A/Headers" -t "$MAC_OS_FRAMEWORK/"
61-
cp -r --copy-content "$MAC_OS_FRAMEWORK/Versions/A/Modules" -t "$MAC_OS_FRAMEWORK/"
62-
cp -r --copy-content "$MAC_OS_FRAMEWORK/Versions/A/Resources" -t "$MAC_OS_FRAMEWORK/"
63-
cp --copy-content "$MAC_OS_FRAMEWORK/Versions/A/SharedAsyncStorage" -t "$MAC_OS_FRAMEWORK/"
60+
cp -rL "$MAC_OS_FRAMEWORK/Versions/A/Headers" "$MAC_OS_FRAMEWORK/"
61+
cp -rL "$MAC_OS_FRAMEWORK/Versions/A/Modules" "$MAC_OS_FRAMEWORK/"
62+
cp -rL "$MAC_OS_FRAMEWORK/Versions/A/Resources" "$MAC_OS_FRAMEWORK/"
63+
cp -L "$MAC_OS_FRAMEWORK/Versions/A/SharedAsyncStorage" "$MAC_OS_FRAMEWORK/"
6464

6565
# clear versions, not needed
6666
rm -r "$MAC_OS_FRAMEWORK/Versions"

0 commit comments

Comments
 (0)