Skip to content

Commit

Permalink
Merge pull request #511 from kilip/refactoring
Browse files Browse the repository at this point in the history
fix travis condition during integration
  • Loading branch information
cbleek committed Nov 12, 2018
2 parents 872778f + ab057a3 commit 9514c40
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -30,13 +30,13 @@ matrix:
env: COVERAGE=yes
- php: 7.2
env: INTEGRATION=yes
if: repo = cross-solution/YAWIK AND branch in (master|develop) AND type NOT IN (pull_request)
if: repo=cross-solution/YAWIK AND branch=~ /(master|develop)/ AND type NOT IN (pull_request)
deploy:
provider: script
script: bash etc/travis/bin/split.sh && bash etc/travis/bin/integration.sh
skip_cleanup: true
on:
branch: $TRAVIS_BRANCH =~ ^master|develop$
branch: $TRAVIS_BRANCH IN (master|develop)

before_install:
- node --version
Expand Down

0 comments on commit 9514c40

Please sign in to comment.