Skip to content

🔄 Integrate develop → staging #281

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

Merged
merged 1 commit into from
Aug 5, 2025
Merged

🔄 Integrate develop → staging #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/integrate-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
create-or-update-pr:
name: Create or Update PR to Staging
runs-on: ubuntu-latest
# Skip if this is a sync commit from main
if: "!contains(github.event.head_commit.message, 'chore: sync version updates from main')"
# Skip if this is a sync from main (by github-actions bot)
if: "github.event.head_commit.author.name != 'github-actions[bot]'"
permissions:
contents: write
pull-requests: write
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ jobs:
git fetch origin develop:develop
git checkout develop

# Merge main changes
git merge main --no-ff -m "chore: sync version updates from main"
# Merge main changes (allow fast-forward for clean sync)
git merge main

# Push directly to develop
git push origin develop
Expand All @@ -160,8 +160,8 @@ jobs:
git fetch origin staging:staging
git checkout staging

# Merge main changes
git merge main --no-ff -m "chore: sync version updates from main"
# Merge main changes (allow fast-forward for clean sync)
git merge main

# Push directly to staging
git push origin staging
Expand Down