From 1b8e1ac05b76fd79274f255c9a828503cee70222 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Nov 2024 22:34:32 +0900 Subject: [PATCH] Fixing PR variables --- .github/workflows/pr_from_upstream.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr_from_upstream.yml b/.github/workflows/pr_from_upstream.yml index cca7543..c396d22 100644 --- a/.github/workflows/pr_from_upstream.yml +++ b/.github/workflows/pr_from_upstream.yml @@ -66,12 +66,12 @@ jobs: fi - 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 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" - branch: ${{ steps.push.outputs.BRANCH_NAME }} + branch: ${{ env.BRANCH_NAME }} title: "Sync with upstream $UPSTREAM_REPO" body: | This PR merges the latest changes from the upstream repository: @@ -83,12 +83,12 @@ jobs: 1. **Fetch the remote branch**: ```bash - git fetch origin ${{ steps.push.outputs.BRANCH_NAME }} + git fetch origin ${{ env.BRANCH_NAME }} ``` 2. **Checkout the branch**: ```bash - git checkout ${{ steps.push.outputs.BRANCH_NAME }} + git checkout ${{ env.BRANCH_NAME }} ``` 3. **Merge the upstream branch manually**: @@ -110,6 +110,6 @@ jobs: 6. **Push the resolved branch**: ```bash - git push origin ${{ steps.push.outputs.BRANCH_NAME }} + git push origin ${{ env.BRANCH_NAME }} ``` base: $TARGET_BRANCH