From 23fe5965b3de341a0f46dd7faf8b53e06d54e417 Mon Sep 17 00:00:00 2001 From: Rafael Gonzaga Date: Wed, 13 Nov 2024 18:47:21 -0300 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Antoine du Hamel Co-authored-by: Aviv Keller --- .github/workflows/create-release-proposal.yml | 9 ++------- tools/actions/create-release.sh | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release-proposal.yml b/.github/workflows/create-release-proposal.yml index 97f3227c4caefd..13ea3bddad4ea1 100644 --- a/.github/workflows/create-release-proposal.yml +++ b/.github/workflows/create-release-proposal.yml @@ -51,11 +51,6 @@ jobs: - name: Install @node-core/utils run: npm install -g @node-core/utils - - name: Set variables - run: | - echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV - echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV - - name: Configure @node-core/utils run: | ncu-config set branch "${RELEASE_BRANCH}" @@ -63,8 +58,8 @@ jobs: ncu-config set username "$USERNAME" ncu-config set token "$GH_TOKEN" ncu-config set jenkins_token "$JENKINS_TOKEN" - ncu-config set repo "${REPOSITORY}" - ncu-config set owner "${OWNER}" + ncu-config set repo "$(echo "$GITHUB_REPOSITORY" | cut -d/ -f2)" + ncu-config set owner "${GITHUB_REPOSITORY_OWNER}" env: USERNAME: ${{ secrets.JENKINS_USER }} GH_TOKEN: ${{ secrets.GH_USER_TOKEN }} diff --git a/tools/actions/create-release.sh b/tools/actions/create-release.sh index 21907b1217bb11..bca44e0e9f1f33 100755 --- a/tools/actions/create-release.sh +++ b/tools/actions/create-release.sh @@ -8,7 +8,7 @@ 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 -echo "/## $RELEASE_DATE/,/^ temp.awk -awk -f temp.awk doc/changelogs/CHANGELOG_V23.md > pr-body.md +MATCHER="/## $RELEASE_DATE/,/^ pr-body.md gh pr create --body-file pr-body.md # TODO: ammend with proposal PR