Merge branch 'master' into wjh/fix-license-check

Author: wjhsf

scripts/release/publish.sh

@@ -2,7 +2,9 @@
 
 # Find the commit on master that last changed the root package.json version,
 # then submit a PR to merge that commit onto the release branch and release via nucleus
+# Optionally set WORK_ITEM env var to include in commit/PR title
 # Usage: yarn release:publish [branch=release]
+# Example: WORK_ITEM=W-1234567 yarn release:publish
 
 set -e
 
@@ -28,35 +30,41 @@ VERSION=$(jq -r .version package.json)
 git switch -c "$BRANCH" "$VERSION_SHA"
 git push origin HEAD
 
-if which gh >/dev/null; then
-  # Use GitHub CLI to create a PR and wait for CI checks to pass
-  gh pr create -t "chore: release $VERSION" -B "$RELEASE_BRANCH" -b ''
-  # Clean up locally
-  git switch "$BASE_BRANCH"
-  git branch -D "$BRANCH"
-
-  # Wait for CI to complete
-  . "$(dirname "$0")/wait-for-pr.sh" "$BRANCH"
-  if ! gh pr checks --fail-fast --watch; then
-    echo 'CI failed. Cannot continue with release.'
-    gh pr view "$BRANCH" --web
-    exit 1
-  fi
-
-  sleep 10 # Give nucleus time to start the release job
-  RELEASE_JOB=$(gh pr checks "$BRANCH" --json name,link -q '.[]|select(.name=="continuous-integration/nucleus/release").link')
-  echo "Nucleus release started: $RELEASE_JOB"
-
-  # Wait for GitHub release to be created by Nucleus, then open it
-  echo 'The GitHub release notes must be added manually. You can exit the script now and open GitHub on your own, or wait until the release is created and the script will open the page for you.'
-  sleep 300 # Nucleus job usually takes ~5 minutes
-  while ! gh release view "v$VERSION" 1>/dev/null 2>/dev/null; do
-    sleep 15
-  done
-  gh release view "v$VERSION" --web
-else
+if ! which gh >/dev/null; then
   # GitHub CLI not installed - clean up and prompt for manual branch creation
   git switch "$BASE_BRANCH"
   git branch -D "$BRANCH"
   echo "Open a PR: https://github.com/salesforce/lwc/pull/new/$BRANCH"
+  exit 0
 fi
+
+PR_TITLE="chore: release $VERSION"
+if [ -n "$WORK_ITEM" ]; then
+  PR_TITLE+=" @$WORK_ITEM"
+fi
+# Use GitHub CLI to create a PR and wait for CI checks to pass
+gh pr create -t "$PR_TITLE" -b '' -B "$RELEASE_BRANCH" -H "$BRANCH"
+# Clean up locally
+git switch "$BASE_BRANCH"
+git branch -D "$BRANCH"
+
+# Wait for CI to complete
+sleep 3 # Give GitHub time to kick off CI
+. "$(dirname "$0")/wait-for-pr.sh" "$BRANCH"
+if ! gh pr checks --fail-fast --watch; then
+  echo 'CI failed. Cannot continue with release.'
+  gh pr view "$BRANCH" --web
+  exit 1
+fi
+
+sleep 10 # Give nucleus time to start the release job
+RELEASE_JOB=$(gh pr checks "$BRANCH" --json name,link -q '.[]|select(.name=="continuous-integration/nucleus/release").link')
+echo "Nucleus release started: $RELEASE_JOB"
+
+# Wait for GitHub release to be created by Nucleus, then open it
+echo 'The GitHub release notes must be added manually. You can exit the script now and open GitHub on your own, or wait until the release is created and the script will open the page for you.'
+sleep 300 # Nucleus job usually takes ~5 minutes
+while ! gh release view "v$VERSION" >/dev/null; do
+  sleep 15
+done
+gh release view "v$VERSION" --web

scripts/release/version.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 # Bump package versions for release and submit a PR on GitHub
+# Optionally set WORK_ITEM env var to include in commit/PR title
 # Usage: yarn release:version <version>
+# Example: WORK_ITEM=W-1234567 yarn release:version patch
 
 set -e
 
@@ -28,24 +30,27 @@ node "$(dirname "$0")/version.js" "$VERSION"
 # Input could have been major/minor/patch; update the var to the resolved version
 VERSION=$(jq -r .version package.json)
 VERSION_BUMP_MESSAGE="chore: bump version to $VERSION"
+if [ -n "$WORK_ITEM" ]; then
+  VERSION_BUMP_MESSAGE+=" @$WORK_ITEM"
+fi
 git commit -am "$VERSION_BUMP_MESSAGE"
 git push origin HEAD
 
-if which gh 2>/dev/null 1>/dev/null; then
-  # Use GitHub CLI to create a PR and wait for it to be merged before exiting
-  gh pr create -t "$VERSION_BUMP_MESSAGE" -b ''
-  gh pr merge --auto --squash --delete-branch
-  git switch "$BASE_BRANCH"
-  git branch -D "$BRANCH"
-  
-  sleep 3 # Give GitHub time to start CI before we check it
-  . "$(dirname "$0")/wait-for-pr.sh" "$BRANCH"
-  while [ "$(gh pr view "$BRANCH" --json state -q .state)" != 'MERGED' ]; do
-    sleep 3 # Wait for GitHub to auto-merge the PR
-  done
-
-else
-  # Clean up and prompt for manual branch creation
+if ! gh >/dev/null; then
+  # No GitHub CLI, gotta do it manually
   git switch "$BASE_BRANCH"
   echo "Open a PR: https://github.com/salesforce/lwc/pull/new/$BRANCH"
+  exit 0
 fi
+
+# Use GitHub CLI to create a PR and wait for it to be merged before exiting
+gh pr create -t "$VERSION_BUMP_MESSAGE" -b ''
+gh pr merge --auto --squash --delete-branch
+git switch "$BASE_BRANCH"
+git branch -D "$BRANCH"
+
+sleep 3 # Give GitHub time to start CI before we check it
+. "$(dirname "$0")/wait-for-pr.sh" "$BRANCH"
+while [ "$(gh pr view "$BRANCH" --json state -q .state)" != 'MERGED' ]; do
+  sleep 3 # Wait for GitHub to auto-merge the PR
+done

scripts/release/wait-for-pr.sh

@@ -13,7 +13,7 @@ if [ -z "$BRANCH" ]; then
 fi
 
 # Wait for CI to complete
-if ! gh pr checks --fail-fast --watch; then
+if ! gh pr checks --fail-fast --watch "$BRANCH"; then
   echo 'CI failed. Cannot continue with release.'
   gh pr view "$BRANCH" --web
   exit 1