newspack-scripts 2.0.0 → 3.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-scripts",
-  "version": "2.0.0",
+  "version": "3.0.0-alpha.3",
   "description": "",
   "bin": {
     "newspack-scripts": "./bin/newspack-scripts.js"

package/post-release.sh

@@ -3,19 +3,31 @@
 git config user.name "$GIT_COMMITTER_NAME"
 git config user.email "$GITHUB_COMMITER_EMAIL"
 
-# Reset the tip of alpha branch to the release branch.
-# The alpha brach is single-serving, just for alpha releases. After a release,
-# we don't care about any alpha changes.
-git pull origin release
-git checkout alpha
-git reset --hard release --
-git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git" --force
+# The last commit message at this point is the automated release commit. The second-to-last
+# commit message should contain data about the merge.
+SECOND_TO_LAST_COMMIT_MSG=$(git log -n 1 --skip 1 --pretty=format:"%s")
 
-# Cherry-pick the latest commit from the release branch onto the master branch.
-# This way the version numbers and the changelog on master are up to date.
-#
-# Note that this will fail if there is no CHANGELOG.md on master - in such case the cherry-pick will
-# result in a conflict.
+LATEST_VERSION_TAG=$(git describe --tags --abbrev=0)
+
+# If the merge was from alpha branch, alpha branch should be reset.
+if [[ $(echo $SECOND_TO_LAST_COMMIT_MSG | grep '^Merge pull request.*alpha') ]]; then
+  echo '[newspack-scripts] Release was created from the alpha branch. Alpha branch will now be reset.'
+
+  # Reset the tip of alpha branch to the release branch.
+  # The alpha brach is single-serving, just for alpha releases. After a release,
+  # we don't care about any alpha changes.
+  git pull origin release
+  git checkout alpha
+  git reset --hard release --
+  # Force-push the alpha branch.
+  git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git" --force
+fi
+
+# Update master branch with latest changes from the release branch, so they are in sync.
+echo '[newspack-scripts] Merging the release branch into master'
 git checkout master
-git cherry-pick $(git rev-parse release) --strategy-option theirs
+# Merge release branch into master branch, prefering the changes from release branch if conflicts arise.
+git merge --squash release --strategy-option=theirs
+git commit --message "chore(release): merge in release $LATEST_VERSION_TAG"
+# Push updated master upstream.
 git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"

package/scripts/release.js

@@ -19,11 +19,18 @@ const config = {
   debug: semanticReleaseArgs.debug,
 
   branches: [
+    // `release` branch is published on the main distribution channel (a new version on GH).
     "release",
+    // `alpha` branch – for regular pre-releases.
     {
       name: "alpha",
       prerelease: "alpha",
     },
+    // `hotfix/*` branches – for releases outside of the release schedule.
+    {
+      name: "hotfix/*",
+      prerelease: "hotfix",
+    },
   ],
   prepare: [
     "@semantic-release/changelog",