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

ci: support merge queue #3652

Merged
merged 4 commits into from
Jun 12, 2023
Merged

ci: support merge queue #3652

merged 4 commits into from
Jun 12, 2023

Conversation

knqyf263
Copy link
Collaborator

@knqyf263 knqyf263 commented Feb 20, 2023

Description

This pull request introduces several enhancements to the Continuous Integration (CI) pipeline, explicitly focusing on the merge queue support. The changes are as follows:

  • Merge queue support: This is a feature provided by GitHub that allows for a queue of pull requests to be merged automatically once the required checks pass. It triggers unit tests. More information about this feature can be found here.
  • Integration test workflow: A new workflow file integration-test.yaml has been added. This workflow runs integration tests.
  • Set unit tests as required: The unit tests have been set as required in the CI pipeline.
  • Always run VM tests: The VM tests are now configured to always run in the CI pipeline.

Screenshot

The branch protection rule is as below:

image

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@knqyf263 knqyf263 self-assigned this Feb 20, 2023
@knqyf263
Copy link
Collaborator Author

GitHub will merge all these changes into base_branch once the checks required by the branch protections of base_branch pass.

Seems like the required checks must be configured on the main branch. It doesn't fit our usage.

@knqyf263 knqyf263 closed this Feb 20, 2023
@knqyf263 knqyf263 deleted the merge_queue branch February 20, 2023 08:58
@knqyf263 knqyf263 restored the merge_queue branch June 12, 2023 07:52
@knqyf263 knqyf263 reopened this Jun 12, 2023
@knqyf263 knqyf263 requested a review from afdesk June 12, 2023 08:07
Copy link
Contributor

@afdesk afdesk left a comment

Choose a reason for hiding this comment

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

LGTM

@knqyf263 knqyf263 merged commit a4f27d2 into aquasecurity:main Jun 12, 2023
@knqyf263 knqyf263 deleted the merge_queue branch June 12, 2023 08:39
AnaisUrlichs pushed a commit to AnaisUrlichs/trivy that referenced this pull request Aug 10, 2023
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.

2 participants