Merge pull request #83 from integr8ly/development

merge development back to master
grafana · Dec 6, 2019 · f551d38 · f551d38
2 parents 621936b + dee56ca
commit f551d38
Show file tree

Hide file tree

Showing 5,328 changed files with 5,495 additions and 2,202,967 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: go
 sudo: required
 
 go:
-  - 1.10.x
+  - 1.13.x
 
 env:
   global:
@@ -19,15 +19,15 @@ jobs:
   include:
     - stage: test
       script:
-        - make setup/dep setup/travis code/check test/unit
+        - make setup/travis code/check test/unit
     - stage: compile
       script:
-        - make setup/dep setup/travis image/build TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
+        - make setup/travis image/build TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
     - stage: push
       script:
         - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
         - export TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
         - docker login --password "$QUAY_PASSWORD" --username "$QUAY_USERNAME" quay.io
-        - make setup/dep setup/travis image/build/push TAG=$TAG
+        - make setup/travis image/build/push TAG=$TAG
         - docker tag quay.io/integreatly/$OPERATOR_NAME:$TAG quay.io/integreatly/$OPERATOR_NAME:$BRANCH
         - docker push quay.io/integreatly/$OPERATOR_NAME:$BRANCH