Skip to content

Commit

Permalink
Merge pull request #800 from kbase/develop
Browse files Browse the repository at this point in the history
develop->master (1.7.1)
  • Loading branch information
eapearson authored Oct 4, 2018
2 parents 797d9e3 + 3e01f29 commit c005f2f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ env:
# Note: this only works for gnu sed, not, e.g., bsd sed as distributed with macos
- REAL_BRANCH=$(git ls-remote origin | sed -n "\|^$TRAVIS_COMMIT\s\+refs/heads/|{s///p}")

if: (branch = develop) OR ((branch = master) AND (tag =~ ^v))
if: (branch = develop) OR ((branch = master) AND (tag =~ /^v.+$/))

# branches:
# only:
Expand Down

0 comments on commit c005f2f

Please sign in to comment.