Merge pull request #1048 from scratchfoundation/implement-semantic-re…

…lease

Implement semantic release

.github/workflows/ci-cd.yml

@@ -2,9 +2,7 @@ name: CI/CD
 
 on:
     workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
-    pull_request: # Runs whenever a pull request is created or updated
     push: # Runs whenever a commit is pushed to the repository
-        branches: [master, develop, hotfix/*]
 
 concurrency:
     group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
@@ -50,38 +48,14 @@ jobs:
                   mkdir -p ./test/results
                   npm test
 
-            - name: Generate release version
-              run: |
-                  export RELEASE_TIMESTAMP=$(date +'%Y%m%d%H%M%S')
-                  export VPKG=$($(npm bin)/json -f package.json version)
-                  export VERSION=${VPKG}-prerelease.${RELEASE_TIMESTAMP}
-
-                  echo "RELEASE_VERSION=${VERSION}" >> $GITHUB_ENV
-
-                  if [[ "${GITHUB_REF##*/}" == hotfix/* ]]; then
-                    echo "NPM_TAG=hotfix" >> $GITHUB_ENV
-                  else
-                    echo "NPM_TAG=latest" >> $GITHUB_ENV
-                  fi
+            - run: npm run build
 
-            - name: Build
-              run: |
-                  npm run build
-                  npm --no-git-tag-version version $RELEASE_VERSION
-
-            - name: Deploy to NPM (do a dry-run if not on master, develop, or hotfix/*)
+            - name: Run semantic-release
               env:
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-                  NPM_TAG: ${{ env.NPM_TAG }}
-              run: |
-                  message=$([[ "$TRIGGER_DEPLOY" == "false" ]] && echo "DRY RUN of" || echo "Deploying")
-                  echo "$message version $RELEASE_VERSION to $NPM_TAG"
-                  npm set //registry.npmjs.org/:_authToken=$NPM_TOKEN
-                  npm publish --tag $NPM_TAG $([[ "$TRIGGER_DEPLOY" == "false" ]] && echo "--dry-run")
-
-            - name: Check Release Version and Create Tag
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
-                  if npm info | grep -q $RELEASE_VERSION; then 
-                    git tag $RELEASE_VERSION 
-                    git push origin $RELEASE_VERSION
+                  if [[ ${{contains(github.ref, 'hotfix/')}} ]]; then
+                      sed -e "s|hotfix/REPLACE|${{ github.ref_name }}|" --in-place release.config.js
                   fi
+                  npx --no -- semantic-release

.github/workflows/commitlint.yml

@@ -0,0 +1,12 @@
+name: Lint commit messages
+on: [pull_request]
+
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}"
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: wagoid/commitlint-github-action@v5

.husky/.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit "$1"

README.md

@@ -68,3 +68,20 @@ npm test
 
 ## Donate
 We provide [Scratch](https://scratch.mit.edu) free of charge, and want to keep it that way! Please consider making a [donation](https://secure.donationpay.org/scratchfoundation/) to support our continued engineering, design, community, and resource development efforts. Donations of any size are appreciated. Thank you!
+
+## Committing
+
+This project uses [semantic release](https://github.com/semantic-release/semantic-release) to ensure version bumps
+follow semver so that projects depending on it don't break unexpectedly.
+
+In order to automatically determine version updates, semantic release expects commit messages to follow the
+[conventional-changelog](https://github.com/bcoe/conventional-changelog-standard/blob/master/convention.md)
+specification.
+
+You can use the [commitizen CLI](https://github.com/commitizen/cz-cli) to make commits formatted in this way:
+
+```bash
+npm install -g commitizen@latest cz-conventional-changelog@latest
+```
+
+Now you're ready to make commits using `git cz`.

commitlint.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+    extends: ['@commitlint/config-conventional'],
+    ignores: [message => message.startsWith('chore(release):')]
+};