Skip to content

Commit

Permalink
chore: fix travis deploy condition
Browse files Browse the repository at this point in the history
  • Loading branch information
lionelvillard committed Jan 30, 2019
1 parent 93a90c3 commit 40c3fea
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions .travis.yml
Expand Up @@ -5,7 +5,7 @@ dist: xenial
sudo: required
services:
- docker

go_import_path: github.com/ibm/openwhisk-operator

before_install:
Expand All @@ -16,16 +16,16 @@ before_install:
- ./tools/travis/bx-setup.sh
- if [ ! -z "$RUN_DEP" ]; then curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh ; fi
- go get -v github.com/onsi/ginkgo/ginkgo

install:
- if [ ! -z "$RUN_DEP" ]; then dep ensure -v; fi

jobs:
include:
- stage: test
script: make test
script: make test
env:
- KB_VERSION=1.0.5 REMOTE_OPENWHISK=1 INSTALL_IBMCLOUD=1 INSTALL_K8S_TOOLS=1 RUN_DEP=1
- KB_VERSION=1.0.5 REMOTE_OPENWHISK=1 INSTALL_IBMCLOUD=1 INSTALL_K8S_TOOLS=1 RUN_DEP=1
- script: test/e2e/test-install.sh
env:
- INSTALL_MINIKUBE=1 INSTALL_K8S_TOOLS=1
Expand All @@ -35,7 +35,6 @@ jobs:
- stage: deploy
script: bash tools/travis/docker.sh
env:
- RUN_DEP=1
- RUN_DEP=1
skip_cleanup: true
if: branch = master OR env(TRAVIS_TAG)

if: (branch = master AND type = push) OR tag =~ ^v

0 comments on commit 40c3fea

Please sign in to comment.