Skip to content

🐛 Fix devtools getmode parseQueryString#34417

Closed
mszylkowski wants to merge 6 commits intoampproject:mainfrom
mszylkowski:devtools_getmode
Closed

🐛 Fix devtools getmode parseQueryString#34417
mszylkowski wants to merge 6 commits intoampproject:mainfrom
mszylkowski:devtools_getmode

Conversation

@mszylkowski
Copy link
Copy Markdown
Contributor

@mszylkowski mszylkowski commented May 17, 2021

Between #34372 and #34399 the method name parseQueryString was changed (underscore removed) and the checks didn't catch the error in time. Removing the underscore to fix the call to parseQueryString

@mszylkowski mszylkowski self-assigned this May 17, 2021
@mszylkowski mszylkowski marked this pull request as ready for review May 17, 2021 21:02
@amp-owners-bot amp-owners-bot bot requested a review from erwinmombay May 17, 2021 21:02
@mszylkowski mszylkowski enabled auto-merge (squash) May 17, 2021 21:02
@mszylkowski mszylkowski requested a review from rcebulko May 17, 2021 21:03
@processprocess
Copy link
Copy Markdown
Contributor

@rsimha It's interesting that checks didn't catch this 🤔 we want to point it out just in case.
We were able to submit parseQueryString_ even though it was undefined.

@mszylkowski mszylkowski disabled auto-merge May 17, 2021 21:07
@mszylkowski
Copy link
Copy Markdown
Contributor Author

Closing in favor of #34420

@rcebulko
Copy link
Copy Markdown
Contributor

rcebulko commented May 17, 2021

@rsimha It's interesting that checks didn't catch this we want to point it out just in case.
We were able to submit parseQueryString_ even though it was undefined.

@processprocess it looks like they both passed CI and were merged, but since neither touched the same lines it didn't trigger a merge conflict or force an update.

I really should have caught this since I was a reviewer on the original PR and the author on the other, but I likewise mistakenly assumed GH/CI would catch any errors that could arise

@rsimha
Copy link
Copy Markdown
Contributor

rsimha commented May 17, 2021

it looks like they both passed CI and were merged, but since neither touched the same lines it didn't trigger a merge conflict or force an update.

The crux of the issue is what Ryan said here. There's no good way to prevent this other than making sure that two PRs that could affect each other are tested and merged one after the other, and that PRs with older CI runs are rebased before they are merged.

In the case of #34372 and #34399, all the rules were followed, CI was green, and the PRs were merged a short time after running tests. Unfortunately, there was no merge conflict to flag a potential problem. The next line of defense is main branch builds, which worked as designed.

@mszylkowski mszylkowski deleted the devtools_getmode branch May 18, 2021 13:40
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.

4 participants