Fix, refactor; temporary change to test publish-latest.sh

.travis.yml

@@ -7,23 +7,34 @@ before_install:
   - npm install -g typescript
 stages:
   - test
-  - name: deploy
+  - name: publish-edge
     if: (NOT type IN (pull_request)) AND (branch = develop)
+  - name: publish-latest
+    if: (tag =~ /^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$/) AND (branch = automate-publish)
 jobs:
   include:
     - stage: test
       name: "Lint and Test"
       script:
         - npm run lint
         - npm run test
-    - stage: deploy    
-      name: "Deploy to NPM"
+    - stage: publish-edge
+      name: "Publish @edge to NPM"
       script:
         - npm run build
       deploy:
         provider: script
         skip_cleanup: true
-        script: 
-          - ./scripts/publish.sh
+        script: ./scripts/publish-edge.sh
         on:
           branch: develop
+    - stage: publish-edge
+      name: "Publish @latest to NPM"
+      script:
+        - npm run build
+      deploy:
+        provider: script
+        skip_cleanup: true
+        script: ./scripts/publish-latest.sh
+        on:
+          branch: automate-publish

scripts/publish.sh → scripts/functions.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-
 setup_git() {
+  echo "Setting up git"
+
   # Set the user name and email to match the API token holder
   # This will make sure the git commits will have the correct photo
   # and the user gets the credit for a checkin
@@ -15,17 +15,11 @@ setup_git() {
   echo "https://${GITHUB_API_KEY}:@github.com" > .git/credentials
 }
 
-test_master() {
-  if ! [ "$TRAVIS_BRANCH" = "automate-publish" -a -n "$TRAVIS_TAG" ]; then
-  echo "not master or tag!"
-    return 1
-  fi
-  if ! echo "$TRAVIS_TAG" | grep "^v[0-9]\.[0-9]\.[0-9]" >/dev/null; then
-    echo "tag not a version!"
-    return 1
-  fi
+check_version() {
   if ! [ "$TRAVIS_TAG" = "$(npm run version --silent)" ]; then
-    echo "tag not current version!"
+    echo "Tag does not match the version in package.json!"
+    echo "tag: $TRAVIS_TAG"
+    echo "version: $(npm run version --silent)"
     return 1
   fi
   return 0
@@ -55,23 +49,3 @@ publish_latest() {
 
   npm publish
 }
-
-echo "Running on branch ${TRAVIS_BRANCH}":
-
-echo "Setting up git"
-setup_git
-
-# Make sure that the workspace is clean
-# It could be "dirty" if
-# 1. package-lock.json is not aligned with package.json
-# 2. npm install is run
-git checkout -- .
-
-# Echo the status to the log so that we can see it is OK
-git status
-
-if test_master; then
-  publish_latest
-else
-  publish_edge
-fi

scripts/publish-edge.sh

@@ -0,0 +1,16 @@
+. functions.sh
+
+echo "Running on branch ${TRAVIS_BRANCH}":
+
+setup_git
+
+# Make sure that the workspace is clean
+# It could be "dirty" if
+# 1. package-lock.json is not aligned with package.json
+# 2. npm install is run
+git checkout -- .
+
+# Echo the status to the log so that we can see it is OK
+git status
+
+publish_edge

scripts/publish-latest.sh

@@ -0,0 +1,18 @@
+. functions.sh
+
+echo "Running on branch ${TRAVIS_BRANCH}":
+
+setup_git
+
+# Make sure that the workspace is clean
+# It could be "dirty" if
+# 1. package-lock.json is not aligned with package.json
+# 2. npm install is run
+git checkout -- .
+
+# Echo the status to the log so that we can see it is OK
+git status
+
+if check_version; then
+  publish_latest
+fi