Merge branch 'master' of github.com:xenia-project/xenia into d3d12
This commit is contained in:
commit
c7eabd2cd2
|
@ -8,9 +8,9 @@ version: 1.0.{build}-{branch}
|
||||||
# branches to build
|
# branches to build
|
||||||
# Only building master (and pull requests)
|
# Only building master (and pull requests)
|
||||||
branches:
|
branches:
|
||||||
# whitelist
|
# blacklist
|
||||||
only:
|
except:
|
||||||
- master
|
- gh-pages
|
||||||
|
|
||||||
# Do not build on tags (GitHub only)
|
# Do not build on tags (GitHub only)
|
||||||
skip_tags: true
|
skip_tags: true
|
||||||
|
@ -20,6 +20,10 @@ skip_commits:
|
||||||
- docs/*
|
- docs/*
|
||||||
- LICENSE
|
- LICENSE
|
||||||
- README.md
|
- README.md
|
||||||
|
- .travis.yml
|
||||||
|
|
||||||
|
# Skip branches that have an open pull request.
|
||||||
|
skip_branch_with_pr: true
|
||||||
|
|
||||||
pull_requests:
|
pull_requests:
|
||||||
do_not_increment_build_number: true
|
do_not_increment_build_number: true
|
||||||
|
|
Loading…
Reference in New Issue