Xargon/components-template
1
0
Fork 0
mirror of https://github.com/RetroDECK/components-template.git synced 2024-11-22 03:15:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing PR not being created

Browse source
This commit is contained in:
XargonWan 2024-11-05 22:49:57 +09:00
parent 437b595042
commit afac8b0606
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,27 +44,22 @@ jobs:
echo "TARGET_BRANCH=${TARGET_BRANCH}" >> $GITHUB_ENV echo "TARGET_BRANCH=${TARGET_BRANCH}" >> $GITHUB_ENV
- name: Sync from Upstream Repository - name: Sync from Upstream Repository
env:
BRANCH_NAME: "sync-${{ github.run_id }}" # Temporary branch name for the PR
run: | run: |
echo "Syncing from upstream repository $UPSTREAM_REPO on branch $TARGET_BRANCH" echo "Syncing from upstream repository $UPSTREAM_REPO on branch $TARGET_BRANCH"
# Perform fetch and merge, attempting to resolve conflicts by preferring the upstream changes # Perform fetch and merge, attempting to resolve conflicts by preferring the upstream changes
git fetch "$UPSTREAM_REPO" "$TARGET_BRANCH" git fetch "$UPSTREAM_REPO" "$TARGET_BRANCH"
git merge FETCH_HEAD -m "Merge changes from upstream $UPSTREAM_REPO/$TARGET_BRANCH" || {
echo "Conflict detected. Resolving by preferring upstream changes..."
git merge --strategy-option theirs --no-edit FETCH_HEAD
}
- name: Create a new branch for PR if changes detected
id: create_branch
env:
BRANCH_NAME: "sync-${{ github.run_id }}" # Temporary branch name for the PR
run: |
if [ "$(git status --porcelain)" ]; then
git checkout -b "$BRANCH_NAME" git checkout -b "$BRANCH_NAME"
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
else # Attempt to merge, allowing conflicts
echo "No changes detected. Exiting." if ! git merge FETCH_HEAD -m "Merge changes from upstream $UPSTREAM_REPO/$TARGET_BRANCH"; then
exit 0 echo "Conflicts detected. Staging conflicted files for the pull request."
# Stage all changes, including conflicts
git add -A
# Commit the merge with conflicts
git commit -m "Merge changes from upstream $UPSTREAM_REPO/$TARGET_BRANCH with conflicts"
fi fi
- name: Push changes to new branch - name: Push changes to new branch