Skip to content

Clean up Travis config#5727

Merged
zware merged 2 commits into
python:masterfrom
zware:fix_travis
Feb 18, 2018
Merged

Clean up Travis config#5727
zware merged 2 commits into
python:masterfrom
zware:fix_travis

Conversation

@zware
Copy link
Copy Markdown
Member

@zware zware commented Feb 18, 2018

No description provided.

Copy link
Copy Markdown
Member

@berkerpeksag berkerpeksag left a comment

Choose a reason for hiding this comment

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

Looks good to me, thank you for cleaning it up! I just left a note about an older comment on the use of TRAVIS_COMMIT_RANGE.

Comment thread .travis.yml
# Pull requests are slightly complicated because merging the PR commit without
# rebasing causes it to retain its old commit date. Meaning in history if any
# commits have been made on master that post-date it, they will be accidentally
# included in the diff if we use the TRAVIS_COMMIT_RANGE variable.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'd still keep this comment (or a shorter version of it) to explain why we didn't use TRAVIS_COMMIT_RANGE here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Good point, re-added with a bit different wording.

Do note that I did change the logic used; it now matches what I added to AppVeyor last week since the current logic doesn't actually work as expected. I think it does work this way, but time will tell :)

@zware zware merged commit 7eb3f82 into python:master Feb 18, 2018
@miss-islington
Copy link
Copy Markdown
Contributor

Thanks @zware for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@zware zware deleted the fix_travis branch February 18, 2018 16:19
@bedevere-bot
Copy link
Copy Markdown

GH-5737 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 18, 2018
(cherry picked from commit 7eb3f82)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
@miss-islington
Copy link
Copy Markdown
Contributor

Sorry, @zware, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 7eb3f8226ea7b79dae4e4e8b05730cfe0d9af7c1 3.6

@miss-islington
Copy link
Copy Markdown
Contributor

Sorry, @zware, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 7eb3f8226ea7b79dae4e4e8b05730cfe0d9af7c1 2.7

miss-islington added a commit that referenced this pull request Feb 18, 2018
(cherry picked from commit 7eb3f82)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
zware added a commit to zware/cpython that referenced this pull request Feb 18, 2018
(cherry picked from commit 7eb3f82)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

GH-5738 is a backport of this pull request to the 3.6 branch.

zware added a commit to zware/cpython that referenced this pull request Feb 18, 2018
(cherry picked from commit 7eb3f82)

Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

GH-5740 is a backport of this pull request to the 2.7 branch.

zware added a commit that referenced this pull request Feb 18, 2018
zware added a commit that referenced this pull request Feb 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants