PR: troubleshooting the PR not being created

This commit is contained in:
XargonWan 2024-11-06 10:27:11 +09:00
parent dbe7cd6a2d
commit 7a64e1b4d1

View file

@ -62,17 +62,26 @@ jobs:
# Fetch changes from the upstream repository without merging # Fetch changes from the upstream repository without merging
git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}" git fetch "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}"
git diff
git add -A # Check if there are any changes to commit
git commit -m "Updating ${{ github.event.repository.name }} with upstream changes" 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 - name: Push changes to new branch
if: success() if: success() && env.SKIP_PR == 'false'
run: | run: |
git push origin "${{ env.BRANCH_NAME }}" git push origin "${{ env.BRANCH_NAME }}"
- name: Create Pull Request - name: Create Pull Request
if: success() if: success() && env.SKIP_PR == 'false'
uses: peter-evans/create-pull-request@v7.0.5 uses: peter-evans/create-pull-request@v7.0.5
with: with:
token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }} token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }}