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

Make sure scripted jobs use the same commit like publish-local did #10855

Merged

Conversation

mkurz
Copy link
Member

@mkurz mkurz commented May 14, 2021

Please see the comment I added in the test-scripted file.

Now that scala-steward runs monthly, it opens many pull requests at once, in parallel, increasing the chance that these pull requests fail, because of the problem I described in my comment. The problem existed before as well and pull requests failed every now and then, but I never really looked into it what the problem was, until now, when I realized what's going on.

Let's look at one of those failed pull requests: https://travis-ci.com/github/playframework/playframework/builds/225836519:
As you can see, the publish-local jobs used the version 2.8.1+1156-e905d7a5, so the distance from the 2.8.0 tag is 1156 and the current commit is e905d7a (being a merge commit GitHub provides as if the pull request already had been merged, which in reality didn't happen course). Now after that publish local but before the (failed) scripted job started one pull request (#10847) got merged. So based on the information in my comment, the master branch moved forward, and now the scripted jobs use a different version: 2.8.1+1158-5a053e91. Distance got increased by 2 (1 commit for the version update + 1 merge commit) and of course the hash changed.

You can see the difference between the two master branches here:

@mkurz
Copy link
Member Author

mkurz commented May 14, 2021

Oh yes and this pr fixes #10300, #10244 and #10108

@mkurz
Copy link
Member Author

mkurz commented May 14, 2021

@Mergifyio backport 2.8.x

@mergify
Copy link
Contributor

mergify bot commented May 14, 2021

Command backport 2.8.x: pending

Waiting for the pull request to get merged

Copy link
Contributor

@octonato octonato left a comment

Choose a reason for hiding this comment

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

Clever!

And thanks for the whole explanation. Makes lot of sense.

@mergify
Copy link
Contributor

mergify bot commented May 25, 2021

Command backport 2.8.x: success

Backports have been created

@mkurz mkurz deleted the fix_travis_parallel_pull_requests branch May 25, 2021 13:04
mkurz added a commit that referenced this pull request May 25, 2021
Make sure scripted jobs use the same commit like publish-local did (backport #10855)
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.

None yet

2 participants