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 variables

Browse source
This commit is contained in:
XargonWan 2024-11-05 22:34:32 +09:00
parent e3022078cc
commit 1b8e1ac05b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,12 +66,12 @@ jobs:
fi fi
- name: Create Pull Request - name: Create Pull Request
if: success() && steps.push.outputs.BRANCH_NAME != '' # Only run if there are changes if: success() && steps.push.outputs.branch != '' # Only run if there are changes
uses: peter-evans/create-pull-request@v4 uses: peter-evans/create-pull-request@v4
with: with:
token: ${{ steps.generate-rekku-token.outputs.token }} token: ${{ steps.generate-rekku-token.outputs.token || secrets.GITHUB_TOKEN }}
commit-message: "Sync with upstream changes from $UPSTREAM_REPO" commit-message: "Sync with upstream changes from $UPSTREAM_REPO"
branch: ${{ steps.push.outputs.BRANCH_NAME }} branch: ${{ env.BRANCH_NAME }}
title: "Sync with upstream $UPSTREAM_REPO" title: "Sync with upstream $UPSTREAM_REPO"
body: | body: |
This PR merges the latest changes from the upstream repository: This PR merges the latest changes from the upstream repository:
@ -83,12 +83,12 @@ jobs:
1. **Fetch the remote branch**: 1. **Fetch the remote branch**:
```bash ```bash
git fetch origin ${{ steps.push.outputs.BRANCH_NAME }} git fetch origin ${{ env.BRANCH_NAME }}
``` ```
2. **Checkout the branch**: 2. **Checkout the branch**:
```bash ```bash
git checkout ${{ steps.push.outputs.BRANCH_NAME }} git checkout ${{ env.BRANCH_NAME }}
``` ```
3. **Merge the upstream branch manually**: 3. **Merge the upstream branch manually**:
@ -110,6 +110,6 @@ jobs:
6. **Push the resolved branch**: 6. **Push the resolved branch**:
```bash ```bash
git push origin ${{ steps.push.outputs.BRANCH_NAME }} git push origin ${{ env.BRANCH_NAME }}
``` ```
base: $TARGET_BRANCH base: $TARGET_BRANCH