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

Add auto merge for branch 2.0 #240

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add auto merge for branch 2.0 #240

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
36 changes: 36 additions & 0 deletions .github/workflows/auto_merge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Sync 2.0 to main

on:
push:
branches:
- 2.0

jobs:
branch-sync:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Git
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "[email protected]"

- name: Attempt Merge
id: merge
run: |
git fetch origin
git checkout main
git merge --ff-only 2.0
Copy link
Member

@lchrusciel lchrusciel Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ja do tej pory tak lokalnie to robiłem:

Suggested change
git merge --ff-only 2.0
git merge --no-ff --no-edit 2.0

potrzebujemy to chyba zweryfikować


- name: Push Changes to main
if: steps.merge.outcome == 'success'
run: |
git push origin main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Loading