From 8fa22ece5acdee54886cd3c2b7377824f0c833fa Mon Sep 17 00:00:00 2001
From: RafaelGSS <rafael.nunu@hotmail.com>
Date: Tue, 5 Nov 2024 17:12:28 -0300
Subject: [PATCH] fixup! fixup! build: add create release proposal action

---
 .github/workflows/create-release-proposal.yml | 12 ++++++------
 tools/actions/create-release.sh               |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/create-release-proposal.yml b/.github/workflows/create-release-proposal.yml
index 1aace5e1a21b22..b83b70fa8e8fef 100644
--- a/.github/workflows/create-release-proposal.yml
+++ b/.github/workflows/create-release-proposal.yml
@@ -29,9 +29,6 @@ permissions:
 
 jobs:
   env:
-    STAGING_BRANCH: v${{ inputs.release-line }}.x-staging
-    RELEASE_BRANCH: v${{ inputs.release-line }}.x
-    RELEASE_DATE: ${{ inputs.release-date }}
   releasePrepare:
     runs-on: ubuntu-latest
     steps:
@@ -41,7 +38,6 @@ jobs:
           # Needs the whole git history for ncu to work
           # See https://github.com/nodejs/node-core-utils/pull/486
           fetch-depth: 0
-          token: ${{ secrets.GH_USER_TOKEN }}
 
       # Install dependencies
       - name: Install Node.js
@@ -56,10 +52,13 @@ jobs:
         run: |
           echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV
           echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV
+          echo "STAGING_BRANCH=v${{ inputs.release-line }}.x-staging" >> $GITHUB_ENV
+          echo "RELEASE_BRANCH=v${{ inputs.release-line }}.x" >> $GITHUB_ENV
+          echo "RELEASE_DATE=${{ inputs.release-date }}" >> $GITHUB_ENV
 
       - name: Configure @node-core/utils
         run: |
-          ncu-config set branch ${{ env.RELEASE_BRANCH }}
+          ncu-config set branch "${RELEASE_BRANCH}"
           ncu-config set upstream origin
           ncu-config set username "$USERNAME"
           ncu-config set token "$GH_TOKEN"
@@ -72,4 +71,5 @@ jobs:
           JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }}
 
       - name: Start git node release prepare
-        run: ./tools/actions/create-release.sh ${{ inputs.RELEASE_DATE }}
+        run: |
+          ./tools/actions/create-release.sh "${RELEASE_DATE}"
diff --git a/tools/actions/create-release.sh b/tools/actions/create-release.sh
index a39cf24dc4e81d..21907b1217bb11 100755
--- a/tools/actions/create-release.sh
+++ b/tools/actions/create-release.sh
@@ -8,7 +8,6 @@ git node release --prepare --skipBranchDiff
 # We use it to not specify the branch name as it changes based on
 # the commit list (semver-minor/semver-patch)
 git config push.default current
-git push upstream
 echo "/## $RELEASE_DATE/,/^<a id=/{ if (!/^<a id=/) print }" > temp.awk
 awk -f temp.awk doc/changelogs/CHANGELOG_V23.md > pr-body.md
 gh pr create --body-file pr-body.md