ci: Fix workflows to play nicely with merge queues - #369
Merged
leandro-lucarella-frequenz merged 2 commits intoApr 28, 2023
Conversation
leandro-lucarella-frequenz
requested review from
daniel-zullo-frequenz
and removed request for
daniel-zullo-frequenz
April 28, 2023 08:48
github-actions
Bot
added
the
part:tooling
leandro-lucarella-frequenz
enabled auto-merge
April 28, 2023 08:48
leandro-lucarella-frequenz
force-pushed
the
test-event
branch
2 times, most recently
from
April 28, 2023 08:54
8f973a2 to
9ab80c0
Compare
leandro-lucarella-frequenz
disabled auto-merge
April 28, 2023 08:55
leandro-lucarella-frequenz
enabled auto-merge
April 28, 2023 08:55
sahas-subramanian-frequenz
previously approved these changes
Apr 28, 2023
leandro-lucarella-frequenz
added this pull request to the merge queue
Apr 28, 2023
leandro-lucarella-frequenz
removed this pull request from the merge queue due to a manual request
Apr 28, 2023
leandro-lucarella-frequenz
force-pushed
the
test-event
branch
2 times, most recently
from
April 28, 2023 08:59
122ba6b to
53455a6
Compare
daniel-zullo-frequenz
previously approved these changes
Apr 28, 2023
leandro-lucarella-frequenz
force-pushed
the
test-event
branch
from
April 28, 2023 09:06
53455a6 to
e6146b5
Compare
daniel-zullo-frequenz
previously approved these changes
Apr 28, 2023
leandro-lucarella-frequenz
added this pull request to the merge queue
Apr 28, 2023
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Apr 28, 2023
leandro-lucarella-frequenz
added this pull request to the merge queue
Apr 28, 2023
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Apr 28, 2023
leandro-lucarella-frequenz
force-pushed
the
test-event
branch
from
April 28, 2023 10:05
e6146b5 to
fcb91ae
Compare
mathias-baumann-frequenz
previously approved these changes
Apr 28, 2023
leandro-lucarella-frequenz
enabled auto-merge
April 28, 2023 10:08
leandro-lucarella-frequenz
added this pull request to the merge queue
Apr 28, 2023
leandro-lucarella-frequenz
removed this pull request from the merge queue due to a manual request
Apr 28, 2023
We now exclude testing the branches `gh-readonly-queue/**` as these are the pushes GitHub does when "adding" PRs to a merge queue. We only want to test the merge commit of a queue, to make sure all PRs included in that merge play well together. With this we can also remove the (wrong) hacky `if` conditions in `test-generate-docs` and `publish-docs`. Signed-off-by: Leandro Lucarella <leandro.lucarella@frequenz.com>
Signed-off-by: Leandro Lucarella <leandro.lucarella@frequenz.com>
leandro-lucarella-frequenz
force-pushed
the
test-event
branch
from
April 28, 2023 10:27
fcb91ae to
a0d63cf
Compare
leandro-lucarella-frequenz
changed the title
leandro-lucarella-frequenz
enabled auto-merge
April 28, 2023 10:30
Contributor
Author
|
OK, I polished and rebranded this PR, in my tests it seems to work correctly now. I enabled auto-merge when it is approved, this time it should be merged for real. But this time before approving, please actually review 😄 |
mathias-baumann-frequenz
approved these changes
Apr 28, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The previous PR was merged unintentionally having some debug code and hacky (and wrong) conditions.
We actually don't need to test any pushes to
gh-readonly-queue/**branches, we only need to test the merge (merge_groupevent).