Xargon/components-template
1
0
Fork 0
mirror of https://github.com/RetroDECK/components-template.git synced 2024-11-21 19:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Never do an automatic merge

Browse source
This commit is contained in:
XargonWan 2024-11-05 22:38:55 +09:00
parent 1b8e1ac05b
commit 437b595042
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.github/workflows/pr_from_upstream.yml vendored
View file

@ -54,19 +54,26 @@ jobs:
git merge --strategy-option theirs --no-edit FETCH_HEAD git merge --strategy-option theirs --no-edit FETCH_HEAD
} }
- name: Push changes if there are updates - name: Create a new branch for PR if changes detected
id: create_branch
env: env:
BRANCH_NAME: "sync-${{ github.run_id }}" # Temporary branch name for the PR BRANCH_NAME: "sync-${{ github.run_id }}" # Temporary branch name for the PR
run: | run: |
if [ "$(git status --porcelain)" ]; then if [ "$(git status --porcelain)" ]; then
git checkout -b "$BRANCH_NAME" git checkout -b "$BRANCH_NAME"
git push origin "$BRANCH_NAME" echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
else else
echo "No changes to push." echo "No changes detected. Exiting."
exit 0
fi fi
- name: Push changes to new branch
if: success()
run: |
git push origin "$BRANCH_NAME"
- name: Create Pull Request - name: Create Pull Request
if: success() && steps.push.outputs.branch != '' # Only run if there are changes if: success()
uses: peter-evans/create-pull-request@v4 uses: peter-evans/create-pull-request@v4
with: with:
token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }} token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }}
@ -112,4 +119,4 @@ jobs:
```bash ```bash
git push origin ${{ env.BRANCH_NAME }} git push origin ${{ env.BRANCH_NAME }}
``` ```
base: $TARGET_BRANCH base: $TARGET_BRANCH