Skip to content
This repository was archived by the owner on Oct 1, 2019. It is now read-only.

Bump prettier #10

Merged
merged 2 commits into from
Dec 26, 2017
Merged

Bump prettier #10

merged 2 commits into from
Dec 26, 2017

Conversation

azz
Copy link
Member

@azz azz commented Dec 26, 2017

Includes prettier/prettier#3575
Unblocks #9

@@ -14,7 +14,7 @@
"node": ">=6"
},
"dependencies": {
"prettier": "azz/prettier#f6d0b5fe"
"prettier": "prettier/prettier#ee148bfdeda373445ac9b67338cbae3df10a6576"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe prettier/prettier#master since this is under dev anyway?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to be explicit in package.json since it's locked in yarn.lock anyway.

@vjeux
Copy link
Contributor

vjeux commented Dec 26, 2017

I had to reset the travis cache as it was using a different version for some reason. By the way, why does travis run the tests twice, once for "pr" and once for "push"?

@vjeux vjeux merged commit 6a2ce6e into master Dec 26, 2017
@j-f1
Copy link
Member

j-f1 commented Dec 26, 2017

By the way, why does travis run the tests twice, once for "pr" and once for "push"?

PR builds are run on a merge commit automatically created on each update of the PR, merging it into the target branch.

Push builds are run on any commit pushed to the repository.

@taion
Copy link
Contributor

taion commented Dec 26, 2017

It's because you're submitting PRs from the main repo.

You need to set branches in .travis.yml: https://github.com/react-bootstrap/react-bootstrap/blob/b6fb8d6e7f34d6849de19211537912c188a604ff/.travis.yml#L21-L24

This will disable "push" builds on branches other than the ones listed above.

@azz
Copy link
Member Author

azz commented Dec 26, 2017

Yeah I pushed the branch to the wrong remote (forgot the -u)

@azz azz deleted the bump-prettier branch December 26, 2017 21:39
@taion
Copy link
Contributor

taion commented Dec 26, 2017

In general it's not a bad idea to just whitelist master/next though

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants