Skip to content

Commit e5d6147

Browse files
committed
ci: fix iOS SDK clone path collision in release workflow
When called from the iOS SDK repo, ../OneSignal-iOS-SDK resolves to the workspace itself. Detect this and clone to $RUNNER_TEMP instead, passing IOS_SDK_PATH to the update script. Made-with: Cursor
1 parent 61eb7fa commit e5d6147

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

.github/workflows/create-release-pr.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ jobs:
6666
name: Create Release PR
6767
needs: prep
6868
runs-on: macos-latest
69-
defaults:
70-
run:
71-
working-directory: dotnet-sdk
7269
outputs:
7370
dotnet_from: ${{ steps.current_versions.outputs.dotnet_from }}
7471
android_from: ${{ steps.current_versions.outputs.android_from }}
@@ -81,7 +78,6 @@ jobs:
8178
repository: OneSignal/OneSignal-DotNet-SDK
8279
ref: ${{ needs.prep.outputs.release_branch }}
8380
token: ${{ secrets.GH_PUSH_TOKEN || github.token }}
84-
path: dotnet-sdk
8581

8682
- name: Setup Git User
8783
uses: OneSignal/sdk-shared/.github/actions/setup-git-user@main
@@ -111,7 +107,15 @@ jobs:
111107
# Clone iOS SDK if ios_version is provided
112108
if [ -n "${{ inputs.ios_version }}" ]; then
113109
echo "Cloning iOS SDK..."
114-
git clone --branch ${{ inputs.ios_version }} --depth 1 https://github.com/OneSignal/OneSignal-iOS-SDK.git ../OneSignal-iOS-SDK
110+
IOS_CLONE_PATH="../OneSignal-iOS-SDK"
111+
# When called from the iOS SDK repo, ../OneSignal-iOS-SDK resolves to the
112+
# workspace itself. Clone to a temp path and set IOS_SDK_PATH for the script.
113+
RESOLVED=$(cd "$(dirname "$IOS_CLONE_PATH")" && echo "$(pwd)/$(basename "$IOS_CLONE_PATH")")
114+
if [ "$RESOLVED" = "$(pwd)" ]; then
115+
IOS_CLONE_PATH="${RUNNER_TEMP}/OneSignal-iOS-SDK"
116+
export IOS_SDK_PATH="$IOS_CLONE_PATH"
117+
fi
118+
git clone --branch ${{ inputs.ios_version }} --depth 1 https://github.com/OneSignal/OneSignal-iOS-SDK.git "$IOS_CLONE_PATH"
115119
fi
116120
117121
echo "Running update_native_binaries.sh..."

update_native_binaries.sh

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -e
77
# ./update_native_binaries.sh --android_native_version=5.1.37 --ios_native_version=5.2.14
88

99
WORKING_DIR=$(pwd)
10+
IOS_SDK_PATH="${IOS_SDK_PATH:-../OneSignal-iOS-SDK}"
1011

1112
# Parse input params from terminal
1213
for arg in "$@"; do
@@ -45,16 +46,16 @@ update_ios_binaries() {
4546
rm -rf OneSignalSDK.DotNet.iOS.Binding/OneSignalInAppMessages.xcframework/
4647
rm -rf OneSignalSDK.DotNet.iOS.Binding/OneSignalLocation.xcframework/
4748
rm -rf OneSignalSDK.DotNet.iOS.Binding/OneSignalLiveActivities.xcframework/
48-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework"
49-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework"
50-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework"
51-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework"
52-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework"
53-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework"
54-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework"
55-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework"
56-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework"
57-
move_ios_binary "../OneSignal-iOS-SDK/iOS_SDK/OneSignalSDK/OneSignal_LiveActivities/OneSignalLiveActivities.xcframework"
49+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework"
50+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework"
51+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework"
52+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework"
53+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_OSCore/OneSignalOSCore.xcframework"
54+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework"
55+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_User/OneSignalUser.xcframework"
56+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_InAppMessages/OneSignalInAppMessages.xcframework"
57+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_Location/OneSignalLocation.xcframework"
58+
move_ios_binary "${IOS_SDK_PATH}/iOS_SDK/OneSignalSDK/OneSignal_LiveActivities/OneSignalLiveActivities.xcframework"
5859
}
5960

6061
update_android_binaries() {

0 commit comments

Comments
 (0)