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

Enable "Auto label" for merge-queue actions #3409

Merged
merged 4 commits into from
Aug 2, 2024

Conversation

tautschnig
Copy link
Member

This will Fix merge-queue CI actions as this is a required CI action, but wasn't being run for jobs entering the queue.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

This will Fix merge-queue CI actions as this is a required CI action,
but wasn't being run for jobs entering the queue.
@tautschnig tautschnig requested a review from a team as a code owner August 2, 2024 18:34
Copy link
Contributor

@jaisnan jaisnan left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Contributor

@celinval celinval left a comment

Choose a reason for hiding this comment

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

This workflow will potentially invoke the benchcomp workflow, which I think may require changes as well, since it has code that depends on the event trigger. Can you please double check! Thanks

@tautschnig
Copy link
Member Author

This workflow will potentially invoke the benchcomp workflow, which I think may require changes as well, since it has code that depends on the event trigger. Can you please double check! Thanks

The job for invoking benchcomp workflows is defined as verification-bench in the very same file that this PR touches, so I believe we are actually fine here.

@celinval
Copy link
Contributor

celinval commented Aug 2, 2024

In that workflow, we have this code to extract the commits that will be compared:

- name: Save push event HEAD and HEAD~ to environment variables
if: ${{ github.event_name == 'push' }}
run: |
echo "NEW_REF=${{ github.event.after}}" | tee -a "$GITHUB_ENV"
echo "OLD_REF=${{ github.event.before }}" | tee -a "$GITHUB_ENV"
- name: Save pull request HEAD and base to environment variables
if: ${{ contains(fromJSON('["pull_request", "pull_request_target"]'), github.event_name) }}
run: |
echo "OLD_REF=${{ github.event.pull_request.base.sha }}" | tee -a "$GITHUB_ENV"
echo "NEW_REF=${{ github.event.pull_request.head.sha }}" | tee -a "$GITHUB_ENV"

I think in the new case, it won't enter any of these steps, and the commits to be compared will not be defined.

@tautschnig
Copy link
Member Author

In that workflow, we have this code to extract the commits that will be compared:

[...]

Oh, thank you for highlighting this, you are absolutely right. I will fix this, but the way I intend to fix this is by not running this performance check workflow for merge queues at all. My reasons for doing this are:

  1. The job is not marked as "Required," so failures will not block the queue from progressing.
  2. No one will look at the individual job outcomes when the merging attempt does not fail.
  3. We run performance verification upon pushing to main anyway.

@celinval
Copy link
Contributor

celinval commented Aug 2, 2024

In that workflow, we have this code to extract the commits that will be compared:
[...]

Oh, thank you for highlighting this, you are absolutely right. I will fix this, but the way I intend to fix this is by not running this performance check workflow for merge queues at all. My reasons for doing this are:

1. The job is not marked as "Required," so failures will not block the queue from progressing.

2. No one will look at the individual job outcomes when the merging attempt does not fail.

3. We run performance verification upon pushing to `main` anyway.

Sounds good to me!

@tautschnig tautschnig enabled auto-merge (squash) August 2, 2024 20:56
@tautschnig tautschnig merged commit 550e4d4 into model-checking:main Aug 2, 2024
27 checks passed
@tautschnig tautschnig deleted the merge-queue-fix branch August 2, 2024 21:43
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.

3 participants