Skip to content

Commit

Permalink
Merge commit '3c29f72cd2c84b6d9f12888b3790d9edfa9e6ab7'
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis CI committed Oct 11, 2021
2 parents 9bdbf92 + 3c29f72 commit edcd7b9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:

stages:
- name: test
if: branch!=master AND branch!=develop AND branch!=^untagged.*
if: NOT (branch IN (develop,master))
- name: merge (develop --> master)
if: branch=develop AND type!=pull_request
if: branch==develop AND NOT(type==pull_request)
- name: deploy
if: branch=master
if: branch==master

notifications:
email: false

0 comments on commit edcd7b9

Please sign in to comment.