Merge pull request #204 from Augmint/staging

Release v1.0.7
Augmint · Apr 18, 2019 · ff67acf · ff67acf
2 parents 8944277 + f969012
commit ff67acf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,10 @@
 dist: xenial # https://docs.travis-ci.com/user/reference/xenial/
 language: node_js
 cache: yarn
+env:
+    global:
+        # value is master if tag build AND on master  https://github.com/travis-ci/travis-ci/issues/5419#issuecomment-222815942
+        - BRANCH_OF_TAG=$(git branch --contains $TRAVIS_TAG | grep -l '^[\* ] master$')
 before_install:
     - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
     - export PATH="$HOME/.yarn/bin:$PATH"
@@ -29,19 +33,26 @@ after_success:
     - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
     - chmod +x send.sh
     - ./send.sh success $DISCORD_WEBHOOK_URL
-    - echo after_succes TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER TRAVIS_COMMIT=$TRAVIS_COMMIT ;
-    - if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
-      echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
-      yarn docker:tag ;
-      yarn docker:tag:latest ;
-      docker push augmint/contracts ;
-      fi
-    - if [ "$TRAVIS_BRANCH" == "staging" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
-      echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
-      yarn docker:tag ;
-      yarn docker:tag:staging ;
-      docker push augmint/contracts ;
-      fi
+    - echo after_success TRAVIS_BRANCH=$TRAVIS_BRANCH BRANCH_OF_TAG=$BRANCH_OF_TAG TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_TAG=$TRAVIS_TAG TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER TRAVIS_COMMIT=$TRAVIS_COMMIT ;
+    - |
+        if [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        if [ $TRAVIS_BRANCH == "master" ] || [ $BRANCH_OF_TAG == "master" ]; then
+        echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
+        yarn docker:tag:build ;
+        if [ ! -z "$VERSION_TAG" ]; then
+        yarn docker:tag:version $TRAVIS_TAG;
+        fi
+        yarn docker:tag:latest; # NB: it will tag old version with latest if you tag an old commit on master
+        docker push augmint/contracts ;
+        fi
+        fi
+    - |
+        if [ "$TRAVIS_BRANCH" == "staging" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin ;
+        yarn docker:tag:build ;
+        yarn docker:tag:staging ;
+        docker push augmint/contracts ;
+        fi
 after_failure:
     - wget https://raw.githubusercontent.com/k3rn31p4nic/travis-ci-discord-webhook/master/send.sh
     - chmod +x send.sh

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "augmint-contracts",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Augmint Stable Tokens - Solidity contracts",
   "author": "“Augmint”",
   "homepage": "https://github.com/Augmint/augmint-contracts#readme",
@@ -41,16 +41,16 @@
     "docker:run": "docker rm ganache ; docker run --init --name ganache -p 8545:8545 localdockerimage --db ./dockerLocalchaindb --gasLimit 0x47D5DE --gasPrice 1000000000 --networkId 999 -m \"hello build tongue rack parade express shine salute glare rate spice stock\" & wait",
     "docker:start": "docker start ganache || yarn docker:run",
     "docker:stop": "docker stop ganache",
-    "docker:tag": "docker tag localdockerimage augmint/contracts:commit-$(git log -1 --format='%h'); docker tag localdockerimage augmint/contracts:build-$TRAVIS_BUILD_NUMBER",
+    "docker:tag:build": "docker tag localdockerimage augmint/contracts:commit-$(git log -1 --format='%h'); docker tag localdockerimage augmint/contracts:build-$TRAVIS_BUILD_NUMBER",
     "docker:tag:staging": "docker tag localdockerimage augmint/contracts:staging;",
-    "docker:tag:latest": "docker tag localdockerimage augmint/contracts:latest; yarn cross-conf-env docker tag localdockerimage augmint/contracts:v$npm_package_version"
+    "docker:tag:latest": "docker tag localdockerimage augmint/contracts:latest",
+    "docker:tag:version": "docker tag localdockerimage augmint/contracts:$1"
   },
   "devDependencies": {
     "abiniser": "0.5.1",
     "babel-register": "6.26.0",
     "bignumber.js": "5.0.0",
     "coveralls": "3.0.3",
-    "cross-conf-env": "1.1.2",
     "dotenv": "7.0.0",
     "eslint": "5.16.0",
     "ganache-cli": "6.4.3",

diff --git a/yarn.lock b/yarn.lock
@@ -750,13 +750,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-conf-env@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/cross-conf-env/-/cross-conf-env-1.1.2.tgz#edd96bfff48e4cedb0f741cca52788f64b3ae640"
-  integrity sha1-7dlr//SOTO2w90HMpSeI9ks65kA=
-  dependencies:
-    cross-spawn "^5.0.1"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"