Don't bother with canary, just use master

JDLT-Ltd · Dec 12, 2019 · a4eaa38 · a4eaa38
1 parent 708bedc
commit a4eaa38
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,9 +1,9 @@
-name: Publish
+name: Release
 
 on:
   push:
     branches:
-      - canary
+      - master
 
 jobs:
   build:
@@ -21,7 +21,27 @@ jobs:
       - name: Potentially save npm token
         run: |
           ([[ ! -z ${{ secrets.NPM_TOKEN }} ]] && echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc) || echo "Did not write npm token"
-      - name: Publish to npm
-        run: yarn run lerna publish from-git --npm-tag canary --yes
+      - name: Potentially publish canary to npm
+        run: |
+          if \
+            ls ~/.npmrc >/dev/null 2>&1 && \
+            [[ $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; \
+          then
+            yarn run lerna publish from-git --npm-tag canary --yes
+          else
+            echo "Did not publish canary"
+          fi
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Potentially publish stable to npm
+        run: |
+          if \
+            ls ~/.npmrc >/dev/null 2>&1 && \
+            [[ ! $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; \
+          then
+            yarn run lerna publish from-git --yes
+          else
+            echo "Did not publish"
+          fi
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/nodejs.yml → .github/workflows/test.yml b/.github/workflows/nodejs.yml → .github/workflows/test.yml
@@ -1,12 +1,6 @@
-name: CI
+name: Test
 
 on:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-
   pull_request:
     types: [opened, synchronize, reopened]