Skip to content
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

Jump to bottom

Update merge process in GitHub workflow #164

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Update merge process in GitHub workflow #164

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
19 changes: 8 additions & 11 deletions .github/workflows/merge-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,11 @@ jobs:
git config user.name ${{ github.actor }}
- name: Merge dev -> main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
run: |
git status
git fetch
git checkout dev
git pull
git checkout main
git rebase dev
git push origin main
git status
uses: pascalgn/merge-fast-forward-action@v1.3.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SUCCESS_MESSAGE: "Release merged successfully via fast-forward"
FAILURE_MESSAGE: "Failed to merge release via fast-forward"
UPDATE_STATUS: "true"
PRODUCTION_BRANCH: "main"
STAGING_BRANCH: "dev"
Loading