From 7a64e1b4d1418b82658b1f7445e1c5169d66b20f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Nov 2024 10:27:11 +0900 Subject: [PATCH] PR: troubleshooting the PR not being created --- .github/workflows/pr_from_upstream.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr_from_upstream.yml b/.github/workflows/pr_from_upstream.yml index 38e7c00..7ea95f6 100644 --- a/.github/workflows/pr_from_upstream.yml +++ b/.github/workflows/pr_from_upstream.yml @@ -62,17 +62,26 @@ jobs: # Fetch changes from the upstream repository without merging git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" + + git diff - git add -A - git commit -m "Updating ${{ github.event.repository.name }} with upstream changes" + # Check if there are any changes to commit + if git diff --exit-code "origin/${{ env.TARGET_BRANCH }}"; then + echo "No changes detected from upstream. Exiting without creating PR." + echo "SKIP_PR=true" >> $GITHUB_ENV + else + git add -A + git commit -m "Updating ${{ github.event.repository.name }} with upstream changes" + echo "SKIP_PR=false" >> $GITHUB_ENV + fi - name: Push changes to new branch - if: success() + if: success() && env.SKIP_PR == 'false' run: | git push origin "${{ env.BRANCH_NAME }}" - name: Create Pull Request - if: success() + if: success() && env.SKIP_PR == 'false' uses: peter-evans/create-pull-request@v7.0.5 with: token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }}