Merge upstream master into patched/master

ba08261a · github-actions · f2b40e2e · 963cb6af · ba08261a
Commit ba08261a authored Aug 11, 2021 by github-actions
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

merge-upstream.yml .github/workflows/merge-upstream.yml +1 -0

No files found.
--- a/.github/workflows/merge-upstream.yml
+++ b/.github/workflows/merge-upstream.yml
@@ -18,6 +18,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
        with:
+          ref: patches
          fetch-depth: 0
          ssh-key: ${{ secrets.DEPLOY_KEY }}
      - run: bash scripts/upgradeable/git-user-config.sh