Skip to content

Fix release workflow submodule checkout conflict during bundle updates #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −9
Draft

Fix release workflow submodule checkout conflict during bundle updates #517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf55d7
Initial plan
Copilot May 19, 2026
650d21b
fix(ci): checkout submodule branches before bundle generation in rele…
Copilot May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .github/workflows/create_draft_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,17 +209,28 @@ jobs:
GIT_COMMITTER_NAME: github-actions[bot]
GIT_COMMITTER_EMAIL: github-actions[bot]@users.noreply.github.com
run: |
# Prepare submodules on main before bundle generation
cd android
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git checkout main
git pull origin main
cd ..

cd ios
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git checkout main
git pull origin main
cd ..

# Build bundles in parallel
yarn re:build
yarn bundle:android &&
yarn bundle:ios

# Update Android bundle only
cd android
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git checkout main
git pull origin main
git add ./app/src/main/assets/hyperswitch.bundle

if ! git diff --staged --quiet; then
Expand All @@ -230,11 +241,6 @@ jobs:

# Update iOS bundle only
cd ios
git checkout main
git pull origin main
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

git add ./hyperswitchSDK/Core/Resources/hyperswitch.bundle

if ! git diff --staged --quiet; then
Expand Down