Skip to content

Commit

Permalink
scaffold a workflow to handle automated rebasing of changes and catch…
Browse files Browse the repository at this point in the history
… problems earlier (#1074)
  • Loading branch information
shiftkey committed Jun 2, 2024
1 parent af32122 commit 22c73b0
Showing 1 changed file with 35 additions and 0 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/sync-with-upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: 'Sync main branch with upstream'

on: workflow_dispatch

jobs:
sync-with-upstream:
runs-on: ubuntu-latest
name: Sync main branch with upstream
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Configure git
run: |
git config --global user.name "shiftbot"
git config --global user.email "github@brendanforster.com"
git remote add upstream https://github.com/desktop/desktop.git
shell: bash
- name: Push development changes from upstream to fork
id: sync-development-branch
run: |
git fetch upstream development
git fetch origin development
git checkout -b development upstream/development
git push origin development
shell: bash
- name: Rebase Linux customizations on top of development branch
id: rebase-linux-branch
run: |
git fetch origin linux
git checkout linux
git rebase development linux
git status
git log development...linux --oneline
shell: bash
# TODO: force push this when we're confident that the rebase has succeeded?

0 comments on commit 22c73b0

Please sign in to comment.