Skip to content

Commit

Permalink
tools: update create-release-proposal workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
aduh95 committed Nov 28, 2024
1 parent 853b304 commit 90330bd
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 25 deletions.
30 changes: 17 additions & 13 deletions .github/workflows/create-release-proposal.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# 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

Expand All @@ -25,7 +24,7 @@ env:
NODE_VERSION: lts/*

permissions:
contents: write
contents: read

jobs:
releasePrepare:
Expand All @@ -39,9 +38,6 @@ jobs:
- 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
Expand All @@ -58,29 +54,37 @@ jobs:
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 }}
GH_TOKEN: ${{ github.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
mkdir -p "${XDG_CONFIG_HOME:-~/.config}/changelog-maker"
echo '{}' | jq '{user: env.USERNAME, token: env.TOKEN}' > "${XDG_CONFIG_HOME:-~/.config}/changelog-maker/config.json"
env:
USERNAME: ${{ secrets.JENKINS_USER }}
TOKEN: ${{ github.token }}

- name: Setup git author
run: |
git config --local user.email "[email protected]"
git config --local user.name "Node.js GitHub Bot"
# Workaround, see https://github.com/nodejs/node-core-utils/pull/876
git fetch origin --shallow-exclude v23.3.0 v23.x-staging
git fetch origin --deepen=1 v23.x-staging
- name: Start git node release prepare
# The curl command is to make sure we run the version of the script corresponding to the current workflow.
run: |
curl -L https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_REF}/tools/actions/create-release.sh > tools/actions/create-release.sh
./tools/actions/create-release.sh "${RELEASE_DATE}" "${RELEASE_LINE}"
env:
GH_TOKEN: ${{ secrets.GH_USER_TOKEN }}

- uses: actions/upload-artifact@v4
with:
name: query.gql
path: query.gql
92 changes: 80 additions & 12 deletions tools/actions/create-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,92 @@ if [ -z "$RELEASE_DATE" ] || [ -z "$RELEASE_LINE" ]; then
exit 1
fi

buildMutationQuery() {
repo=$1
branch=$2
commit="${3:-HEAD}"
commit_title="${4:-$(git log -1 "$commit" --format=%s)}"
commit_body="${5:-$(git log -1 "$commit" --format=%b)}"
cat - <<'EOF'
mutation ($repo: String! $branch: String!, $parent: GitObjectID!, $commit_title: String!, $commit_body: String) {
createCommitOnBranch(input: {
branch: {
repositoryNameWithOwner: $repo,
branchName: $branch
},
message: {
headline: $commit_title,
body: $commit_body
},
expectedHeadOid: $parent,
fileChanges: {
additions: [
EOF
git show "$commit" --diff-filter=d --name-only --format= | while read -r FILE; do
echo "{ path: $(
node -p 'JSON.stringify(process.argv[1])' "$FILE"
), contents: $(
node -p 'JSON.stringify(fs.readFileSync(process.argv[1]).toString("base64"))' "$FILE"
) },"
done
echo '], deletions: ['
git show "$commit" --diff-filter=D --name-only --format= | while read -r FILE; do
echo "$(node -p 'JSON.stringify(process.argv[1])' "$FILE"),"
done
cat - <<'EOF'
]
}}) {
commit {
url
}
}
}
EOF
node -p '"variables " + JSON.stringify({
repo: process.argv[1],
branch: process.argv[2],
parent: process.argv[3],
commit_title: process.argv[4],
commit_body: process.argv[5]
}, undefined, 2)' "$repo" "$branch" "$(git rev-parse "${commit}^")" "$commit_title" "${commit_body}"
}

buildMutationQuery "aduh95/node" "test" > mut.gql
exit

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

HEAD_BRANCH="$(git rev-parse --abbrev-ref HEAD)"

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="$(awk "/## ${RELEASE_DATE}/,/^<a id=/{ if (!/^<a id=/) print }" "doc/changelogs/CHANGELOG_V${RELEASE_LINE}.md")"

PR_URL="$(gh pr create --title "$TITLE" --body "$TEMP_BODY" --base "v$RELEASE_LINE.x")"

# Amend commit message so it contains the correct PR-URL trailer.
AMENDED_COMMIT_MSG="$(git log -1 --pretty=%B | sed "s|PR-URL: TODO|PR-URL: $PR_URL|")"
# Create the proposal branch
# gh api \
# --method POST \
# -H "Accept: application/vnd.github+json" \
# -H "X-GitHub-Api-Version: 2022-11-28" \
# "/repos/${GITHUB_REPOSITORY}/git/refs" \
# -f "ref=refs/heads/$HEAD_BRANCH" -f "sha=$(git rev-parse HEAD^)"

# Replace "TODO" with the PR URL in the last commit
git commit --amend --no-edit -m "$AMENDED_COMMIT_MSG" || true
# Create the proposal PR
# PR_URL="$(gh api \
# --method POST \
# --jq .html_url \
# -H "Accept: application/vnd.github+json" \
# -H "X-GitHub-Api-Version: 2022-11-28" \
# "/repos/${GITHUB_REPOSITORY}/pulls" \
# -f "title=$TITLE" -f "body=$TEMP_BODY" -f "head=$HEAD_BRANCH" -f "base=v$RELEASE_LINE.x")"

# Force-push the amended commit
git push --force
# Push the release commit to the proposal branch
buildMutationQuery \
"$GITHUB_REPOSITORY" \
"$HEAD_BRANCH" \
HEAD \
"$(git log -1 HEAD --format=%s)" \
"$(git log -1 HEAD --format=%b | sed "s|PR-URL: TODO|PR-URL: $PR_URL|")" \
> query.gql
# | node --input-type=module -e 'console.log(JSON.stringify({ query: Buffer.concat(await process.stdin.toArray()).toString() }))' \
# | curl -fS -H "Authorization: bearer ${GH_TOKEN}" -X POST --data @- https://api.github.com/graphql

0 comments on commit 90330bd

Please sign in to comment.