From 865701f901b9d1e036215d9e13e5a5c13573f1fa Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 2 Jun 2024 15:14:42 -0300 Subject: [PATCH] scaffold a workflow to handle automated rebasing of changes and catch problems earlier (#1074) --- .github/workflows/sync-with-upstream.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/sync-with-upstream.yml diff --git a/.github/workflows/sync-with-upstream.yml b/.github/workflows/sync-with-upstream.yml new file mode 100644 index 00000000000..d69b1fb60ee --- /dev/null +++ b/.github/workflows/sync-with-upstream.yml @@ -0,0 +1,22 @@ +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: Fetch and merge + id: fetch-merge + run: | + git fetch upstream + shell: bash