Fix publishing configuration, closes #858

.github/workflows/publish-release.yml

@@ -1,28 +1,31 @@
 name: Publish Release
 
 on:
-  pull_request:
-    types: [closed]
+  push:
+    branches: [main]
 
 jobs:
   publish-release:
     permissions:
       contents: write
-    if: |
-      github.event.pull_request.merged == true &&
-      startsWith(github.event.pull_request.head.ref, 'release/')
+    # release merge commits come from GitHub user
+    if: github.event.head_commit.committer.name == 'GitHub'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.sha }}
+          # we need this commit + the last so we can compare below
+          fetch-depth: 2
+      # exit early if the version has not changed
+      - run: ./scripts/check-version.sh ${{ github.event.before }}
       - name: Get Node.js version
         id: nvm
         run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
       - uses: actions/setup-node@v2
         with:
           node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
-      - uses: MetaMask/action-publish-release@v1
+      - uses: MetaMask/action-publish-release@v2.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: |
@@ -51,6 +54,8 @@ jobs:
       - name: Dry Run Publish
         # omit npm-token token to perform dry run publish
         uses: MetaMask/action-npm-publish@v1.1.0
+        env:
+          SKIP_PREPACK: true
 
   publish-npm:
     environment: npm-publish
@@ -71,3 +76,5 @@ jobs:
         uses: MetaMask/action-npm-publish@v1.1.0
         with:
           npm-token: ${{ secrets.NPM_TOKEN }}
+        env:
+          SKIP_PREPACK: true

package.json

@@ -29,7 +29,7 @@
     "lint:eslint": "eslint . --cache --ext js,ts",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
     "lint:misc": "prettier '**/*.json' '**/*.md' '!CHANGELOG.md' '**/*.yml' '!.yarnrc.yml' --ignore-path .gitignore",
-    "prepack": "yarn build",
+    "prepack": "./scripts/prepack.sh",
     "setup": "yarn install",
     "test": "jest",
     "test:watch": "jest --watch"

scripts/check-version.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+set -o pipefail
+
+BEFORE="${1}"
+
+if [[ -z $BEFORE ]]; then
+  echo "Error: Before SHA not specified."
+  exit 1
+fi
+
+VERSION_BEFORE="$(git show "$BEFORE":package.json | jq --raw-output .version)"
+VERSION_AFTER="$(jq --raw-output .version package.json)"
+if [[ "$VERSION_BEFORE" == "$VERSION_AFTER" ]]; then
+  echo "Notice: version unchanged. Skipping release."
+  exit 1
+fi

scripts/prepack.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+set -o pipefail
+
+if [[ -n $SKIP_PREPACK ]]; then
+  echo "Notice: skipping prepack."
+  exit 0
+fi
+
+yarn build