From 96f130f371502d7126151c06747f8ec37e74af03 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 8 Nov 2024 10:43:54 +0900 Subject: [PATCH] PR: troubleshooting the PR not being created --- .github/workflows/pr_from_upstream.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr_from_upstream.yml b/.github/workflows/pr_from_upstream.yml index e14cbce..88053fd 100644 --- a/.github/workflows/pr_from_upstream.yml +++ b/.github/workflows/pr_from_upstream.yml @@ -70,6 +70,8 @@ jobs: git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" git pull "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" + git commit --allow-empty -m "Updating module with upstream repo" + git diff echo "GIT_DIFF=$git diff --minimal" >> $GITHUB_ENV @@ -85,6 +87,7 @@ jobs: if: success() uses: peter-evans/create-pull-request@v7.0.5 with: + delete-branch: true token: ${{ steps.generate-rekku-token.outputs.token || secrets.TRIGGER_BUILD_TOKEN }} commit-message: "Sync with upstream changes from ${{ env.UPSTREAM_REPO }}" branch: ${{ env.BRANCH_NAME }}