diff --git a/.github/workflows/create-release-proposal.yml b/.github/workflows/create-release-proposal.yml new file mode 100644 index 00000000000000..1c7e9f285903e5 --- /dev/null +++ b/.github/workflows/create-release-proposal.yml @@ -0,0 +1,81 @@ +# This action requires the following secrets to be set on the repository: +# GH_USER_NAME: GitHub user whose Jenkins and GitHub token are defined below +# GH_USER_TOKEN: GitHub user token, to be used by ncu and to push changes +# JENKINS_TOKEN: Jenkins token, to be used to check CI status + +name: Create Release Proposal + +on: + workflow_dispatch: + inputs: + release-line: + required: true + type: number + default: 23 + description: 'The release line (without dots or prefix). e.g: 22' + release-date: + required: true + type: string + default: YYYY-MM-DD + description: The release date in YYYY-MM-DD format + +concurrency: ${{ github.workflow }} + +env: + NODE_VERSION: lts/* + +permissions: + contents: write + +jobs: + releasePrepare: + env: + STAGING_BRANCH: v${{ inputs.release-line }}.x-staging + RELEASE_BRANCH: v${{ inputs.release-line }}.x + RELEASE_DATE: ${{ inputs.release-date }} + RELEASE_LINE: ${{ inputs.release-line }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + ref: ${{ env.STAGING_BRANCH }} + # Needs the whole git history for ncu to work + # See https://github.com/nodejs/node-core-utils/pull/486 + fetch-depth: 0 + + # Install dependencies + - name: Install Node.js + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 + with: + node-version: ${{ env.NODE_VERSION }} + + - name: Install @node-core/utils + run: npm install -g @node-core/utils + + - name: Configure @node-core/utils + run: | + ncu-config set branch "${RELEASE_BRANCH}" + ncu-config set upstream origin + ncu-config set username "$USERNAME" + ncu-config set token "$GH_TOKEN" + ncu-config set jenkins_token "$JENKINS_TOKEN" + 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 }} + JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }} + + - name: Set up ghauth config (Ubuntu) + run: | + mkdir -p ~/.config/changelog-maker/ + echo '{ + "user": "'$(ncu-config get username)'", + "token": "'$(ncu-config get token)'" + }' > ~/.config/changelog-maker/config.json + + - name: Start git node release prepare + run: | + ./tools/actions/create-release.sh "${RELEASE_DATE}" "${RELEASE_LINE}" + env: + GH_TOKEN: ${{ secrets.GH_USER_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index b9aa947a756025..febc19e2179306 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,8 @@ release. 18 (LTS) -23.3.0
+23.3.1
+23.3.0
23.2.0
23.1.0
23.0.0
diff --git a/doc/changelogs/CHANGELOG_V23.md b/doc/changelogs/CHANGELOG_V23.md index 47b30d19b91bae..43fb7a7cf239ba 100644 --- a/doc/changelogs/CHANGELOG_V23.md +++ b/doc/changelogs/CHANGELOG_V23.md @@ -8,6 +8,7 @@ +23.3.1
23.3.0
23.2.0
23.1.0
@@ -41,6 +42,17 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + + +## 2024-11-29, Version 23.3.1 (Current), @RafaelGSS + +### Notable Changes + +### Commits + +* \[[`dfd77b442f`](https://github.com/nodejs/node/commit/dfd77b442f)] - fixup! build: add create release proposal action (RafaelGSS) +* \[[`02b5d989ff`](https://github.com/nodejs/node/commit/02b5d989ff)] - **build**: add create release proposal action (RafaelGSS) + ## 2024-11-20, Version 23.3.0 (Current), @RafaelGSS diff --git a/src/node_version.h b/src/node_version.h index 190b8a1f29d502..f3f92a5b168901 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_VERSION_IS_LTS 0 #define NODE_VERSION_LTS_CODENAME "" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) diff --git a/tools/actions/create-release.sh b/tools/actions/create-release.sh new file mode 100755 index 00000000000000..b3a0cd96d014f1 --- /dev/null +++ b/tools/actions/create-release.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +set -xe + +RELEASE_DATE=$1 +RELEASE_LINE=$2 + +if [ -z "$RELEASE_DATE" ] || [ -z "$RELEASE_LINE" ]; then + echo "Usage: $0 " + exit 1 +fi + +git config --local user.email "github-bot@iojs.org" +git config --local user.name "Node.js GitHub Bot" + +git node release --prepare --skipBranchDiff --yes --releaseDate "$RELEASE_DATE" +# 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 + +TITLE=$(awk "/^## ${RELEASE_DATE}/ { print substr(\$0, 4) }" "doc/changelogs/CHANGELOG_V${RELEASE_LINE}.md") + +# Use a temporary file for the PR body +TEMP_BODY=$(mktemp) +awk "/## ${RELEASE_DATE}/,/^ "$TEMP_BODY" + +gh pr create --title "$TITLE" --body-file "$TEMP_BODY" --base "v$RELEASE_LINE.x" + +# Dynamically get the repository (owner/repo) and branch +REPO=$(git remote get-url origin | sed -E 's|^.*github.com[/:]([^/]+/[^.]+)(\.git)?$|\1|') +BRANCH=$(git branch --show-current) + +# Get the PR URL for the current branch in the repository +PR_URL=$(gh pr list --repo "$REPO" --head "$BRANCH" --json url -q ".[0].url") + +# Replace "TODO" with the PR URL in the last commit +git commit --amend --no-edit -m "$(git log -1 --pretty=%B | sed "s|PR-URL: TODO|PR-URL: $PR_URL|")" + +# Force-push the amended commit +git push --force + +rm "$TEMP_BODY" +