Merge pull request #360 from AdExNetwork/dev

Merge Dev into Master

.travis.yml

@@ -1,6 +1,12 @@
 language: rust
+# do not run any default scripts coming from `language: rust` (i.e. travis-ci)
+script:
+install:
+# Also don't cache the cargo registry
+before_cache:
+  - rm -rf /home/travis/.cargo/registry
 rust:
-  - stable
+  - 1.48.0
 os: linux
 # add nodejs for ganche-cli
 node_js: "12.12.0"
@@ -13,34 +19,36 @@ env:
   global:
     - CARGO_MAKE_RUN_CHECK_FORMAT="true"
     - CARGO_MAKE_RUN_CLIPPY="true"
-services:
-  - redis
 
 stages:
-  - test
-  - deploy
+  - name: run all tests
+  - name: release validator
+    if: (tag IS present) AND (tag =~ ^validator-v)
 
 jobs:
   fast_finish: true
   include:
-    - stage: test
-      script:
+    - stage: run all tests
+      # @TODO: Maybe run a separate weekly job and use the cached cargo-make from there
+      install:
         - which cargo-make || cargo install cargo-make
+      script:
         - cargo make ci-flow
-      # But don't cache the cargo registry
-      before_cache:
-        - rm -rf /home/travis/.cargo/registry
-    - stage: deploy
-      if: tag IS present
-      before_deploy:
+      services:
+        - redis
+    - stage: release validator
+      # Disable the default Rust `install` & `script` from Travis
+      install:
+      script:
         - cargo build -p validator_worker --release --all-features --target x86_64-unknown-linux-gnu
-        - cp target/x86_64-unknown-linux-gnu/release/validator_worker validator_worker-v$TRAVIS_TAG
+        - cp target/x86_64-unknown-linux-gnu/release/validator_worker $TRAVIS_TAG
       deploy:
         provider: releases
-        api_key: $GITHUB_API_TOKEN
-        file: $TRAVIS_BUILD_DIR/validator_worker-v$TRAVIS_TAG
-        skip_cleanup: true
+        token: $GITHUB_API_TOKEN
+        file: $TRAVIS_BUILD_DIR/$TRAVIS_TAG
+        cleanup: false
         draft: true
         on:
           tags: true
-          all_branches: true
+          all_branches: true
+        edge: true