Skip to content

feat:auto_rebase #13

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
JarbasAl merged 1 commit into from
Sep 9, 2024
Merged

feat:auto_rebase #13

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
13 changes: 3 additions & 10 deletions .github/workflows/rebase_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Rebase Dev onto Master

on:
workflow_dispatch:
push:
branches:
- master
Expand All @@ -15,17 +16,9 @@ jobs:
ref: master
fetch-depth: 0 # Fetch full history for rebase

- name: Checkout dev branch
run: |
git fetch origin dev
git checkout dev

- name: Rebase dev onto master
run: |
git rebase origin/master

- name: Push rebased dev branch
- name: Sync dev with master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git fetch origin dev
git push origin dev --force