Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: allow all branches except trying.tmp and staging.tmp to be built #3359

Merged
merged 1 commit into from
Oct 26, 2018

Conversation

matthiaskrgr
Copy link
Member

r? @flip1995

The problem was that with the current configuration, if I made a branch feature1 and pushed it to travis to have it checked before making a PR, travis would skip it because it only built the 3 branches that were specified when setting up bors.

The change allows all branch names to be build by default again, except for travis.tmp.
The gh-pages branch is skipped as per travis-ci defaults: https://docs.travis-ci.com/user/customizing-the-build/#safelisting-or-blocklisting-branches

@flip1995
Copy link
Member

flip1995 commented Oct 25, 2018

I think you need to write except instead of skip, as it is described in the Travis doc you posted:

# blocklist
branches:
  except:
  - legacy
  - experimental

Please also exclude staging.tmp and do the same for the appveyor config.

The reason for the whitelist was, that PRs from within this Repo were checked twice. But PRs from this repo itself happen less than PRs from forks, so I guess blacklisting is indeed the better option.

@matthiaskrgr matthiaskrgr changed the title travis: allow all branches except travis.tmp to be built ci: allow all branches except trying.tmp and staging.tmp to be built Oct 25, 2018
@phansch
Copy link
Member

phansch commented Oct 26, 2018

Sounds good to me 👍

bors: try (just checking if trying will also continue work)

@phansch
Copy link
Member

phansch commented Oct 26, 2018

bors r+

bors bot added a commit that referenced this pull request Oct 26, 2018
3359: ci: allow all branches except trying.tmp and staging.tmp to be built r=phansch a=matthiaskrgr

r? @flip1995 

The problem was that with the current configuration, if I made a branch `feature1` and pushed it to travis to have it checked before making a PR, travis would skip it because it only built the 3 branches that were specified when setting up bors.

The change allows all branch names to be build by default again, except for travis.tmp.
The gh-pages branch is skipped as per travis-ci defaults: https://docs.travis-ci.com/user/customizing-the-build/#safelisting-or-blocklisting-branches

Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
@bors
Copy link
Contributor

bors bot commented Oct 26, 2018

try

Build failed

@bors
Copy link
Contributor

bors bot commented Oct 26, 2018

Build failed

@matthiaskrgr
Copy link
Member Author

rustc master crashes when checking hyper https://travis-ci.org/rust-lang-nursery/rust-clippy/jobs/446523247#L1846 :/

@phansch
Copy link
Member

phansch commented Oct 26, 2018

bors r+

bors bot added a commit that referenced this pull request Oct 26, 2018
3359: ci: allow all branches except trying.tmp and staging.tmp to be built r=phansch a=matthiaskrgr

r? @flip1995 

The problem was that with the current configuration, if I made a branch `feature1` and pushed it to travis to have it checked before making a PR, travis would skip it because it only built the 3 branches that were specified when setting up bors.

The change allows all branch names to be build by default again, except for travis.tmp.
The gh-pages branch is skipped as per travis-ci defaults: https://docs.travis-ci.com/user/customizing-the-build/#safelisting-or-blocklisting-branches

Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
@bors
Copy link
Contributor

bors bot commented Oct 26, 2018

@bors bors bot merged commit 9e15791 into rust-lang:master Oct 26, 2018
hcpl added a commit to hcpl/hashbrown that referenced this pull request Oct 31, 2018
bors bot added a commit to rust-lang/hashbrown that referenced this pull request Oct 31, 2018
15: Allow more branches to be built on CI r=Amanieu a=hcpl

Adapted from rust-lang/rust-clippy#3359.

Co-authored-by: hcpl <hcpl.prog@gmail.com>
@matthiaskrgr matthiaskrgr deleted the travis branch January 8, 2019 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants