Skip to content

Update sync-branches.yml #9

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
SSFlowtives merged 1 commit into from
Dec 10, 2024
Merged

Update sync-branches.yml #9

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
35 changes: 23 additions & 12 deletions .github/workflows/sync-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Sync Branches with Main

on:
push:
branches:
- main
branches: [main]

permissions:
contents: write
Expand All @@ -12,26 +11,38 @@ jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
- name: Checkout Main Branch
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up Git user
- name: Setup Git User
run: |
git config user.name "GitHub Action"
git config user.email "action@github.com"

- name: Sync content branch with main
- name: Sync with Dev Branch
run: |
git fetch origin main
git checkout content
git checkout dev
git pull origin dev || echo "No changes to pull for dev"
git reset --hard origin/main
git push origin content --force
git merge --squash origin/main || echo "No changes to merge for dev"
if [ -n "$(git status --porcelain)" ]; then
git commit -m "Squash merge changes from main into dev"
git push origin dev || echo "Failed to push dev branch"
fi
git reset --hard main
git push origin dev --force || echo "Failed to force push dev branch"

- name: Sync dev branch with main
- name: Sync with Content Branch
run: |
git fetch origin main
git checkout dev
git checkout content
git pull origin content || echo "No changes to pull for content"
git reset --hard origin/main
git push origin dev --force
git merge --squash origin/main || echo "No changes to merge for content"
if [ -n "$(git status --porcelain)" ]; then
git commit -m "Squash merge changes from main into content"
git push origin content || echo "Failed to push content branch"
fi
git reset --hard main
git push origin content --force || echo "Failed to force push content branch"