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

PR: troubleshooting the PR not being created

Browse source
This commit is contained in:
XargonWan 2024-11-06 10:37:41 +09:00
parent 7a64e1b4d1
commit 0d5712524f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,6 +30,7 @@ jobs:
git config --global protocol.file.allow always git config --global protocol.file.allow always
git config --global user.name "Rekku" git config --global user.name "Rekku"
git config --global user.email "rekku@retrodeck.net" git config --global user.email "rekku@retrodeck.net"
git config --global pull.rebase false
- name: Set default values for UPSTREAM_REPO and TARGET_BRANCH if not set - name: Set default values for UPSTREAM_REPO and TARGET_BRANCH if not set
run: | run: |
@ -62,6 +63,7 @@ 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 pull "${{ env.UPSTREAM_REPO }}" "${{ env.TARGET_BRANCH }}"
git diff git diff