From 8aa0939c531c2c035acdea74f76eafff3dfeda62 Mon Sep 17 00:00:00 2001 From: nandahkrishna Date: Fri, 2 Apr 2021 07:59:36 +0530 Subject: [PATCH] workflows/{sorbet,spdx}: use origin_branch with git-try-push --- .github/workflows/sorbet.yml | 3 ++- .github/workflows/spdx.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml index 962d3d0e1e..54c9071af7 100644 --- a/.github/workflows/sorbet.yml +++ b/.github/workflows/sorbet.yml @@ -41,7 +41,7 @@ jobs: if git ls-remote --exit-code --heads origin "$BRANCH"; then git checkout "$BRANCH" - git reset origin/master + git reset --hard origin/master else git checkout -B "$BRANCH" origin/master BRANCH_EXISTS="1" @@ -64,6 +64,7 @@ jobs: token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} branch: ${{ steps.update.outputs.branch }} force: true + origin_branch: "master" - name: Open a pull request if: steps.update.outputs.pull_request == 'true' diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index 2845cf45a1..bbda544d45 100644 --- a/.github/workflows/spdx.yml +++ b/.github/workflows/spdx.yml @@ -40,7 +40,7 @@ jobs: if git ls-remote --exit-code --heads origin "$BRANCH"; then git checkout "$BRANCH" - git reset origin/master + git reset --hard origin/master else git checkout -B "$BRANCH" origin/master BRANCH_EXISTS="1" @@ -62,6 +62,7 @@ jobs: token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }} branch: ${{ steps.update.outputs.branch }} force: true + origin_branch: "master" - name: Open a pull request if: steps.update.outputs.pull_request == 'true'