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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃彈 Read merge commit only if file was created #33264

Merged
merged 1 commit into from
Mar 15, 2021
Merged

馃彈 Read merge commit only if file was created #33264

merged 1 commit into from
Mar 15, 2021

Conversation

rsimha
Copy link
Contributor

@rsimha rsimha commented Mar 15, 2021

This PR prevents a race that occurs as follows:

  • A file is directly changed on ampproject/amphtml and a branch is created
  • CI build starts on that branch
  • A PR is created after the first stage of CI has begun, but before the second stage
  • Second stage tries to read the merge commit file

Now, we don't read the merge commit file if it doesn't exist.

Example race:

First stage:

image

Second stage:

image

@rsimha rsimha self-assigned this Mar 15, 2021
@rsimha rsimha merged commit fb7f095 into ampproject:master Mar 15, 2021
@rsimha rsimha deleted the 2021-03-15-PRMergeCommit branch March 15, 2021 18:27
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.

None yet

4 participants