Skip to content

Conversation

@rjaegers
Copy link
Member

🚀 Hey, I have created a Pull Request

Description of changes

This PR (re-)enables the merge queue, the amount of incoming PRs is too high to merge them one-by-one. It is, in most cases, not necessary to run ci on all intermediate queue items. The current queue settings should make it possible to add up to 5 entries to the queue to be simultaneously merged, if they are added in a minute after the first item.

✔️ Checklist

  • I have followed the contribution guidelines for this repository
  • I have added tests for new behavior, and have not broken any existing tests
  • I have added or updated relevant documentation
  • I have verified that all added components are accounted for in the SBOM

@rjaegers rjaegers requested a review from a team as a code owner September 30, 2025 06:39
Copilot AI review requested due to automatic review settings September 30, 2025 06:39
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR enables GitHub's merge queue feature by adding the merge_group trigger to CI workflows. This allows multiple PRs to be batched and merged simultaneously when they're added to the queue within a short time window, reducing the need to run CI on each PR individually.

  • Adds merge queue support to linting and formatting workflow
  • Adds merge queue support to continuous integration workflow

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
.github/workflows/linting-formatting.yml Adds merge_group trigger to enable merge queue for linting workflow
.github/workflows/continuous-integration.yml Adds merge_group trigger to enable merge queue for CI workflow

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2025

📦 Container Size Analysis

Note

Comparing ghcr.io/philips-software/amp-devcontainer-rust:edgeghcr.io/philips-software/amp-devcontainer-rust:pr-953

📈 Size Comparison Table

OS/Platform Previous Current Change Trend
linux/amd64 542.34 MB 542.34 MB 1.09 kB (0%) 🔽
linux/arm64 498.79 MB 498.79 MB +910 B (+0%) 🔼

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2025

⚠️MegaLinter analysis: Success with warnings

Descriptor Linter Files Fixed Errors Warnings Elapsed time
✅ ACTION actionlint 20 0 0 0.55s
✅ DOCKERFILE hadolint 2 0 0 0.67s
✅ GHERKIN gherkin-lint 2 0 0 1.05s
✅ JSON npm-package-json-lint yes no no 0.38s
✅ JSON prettier 15 2 0 0 0.5s
✅ JSON v8r 15 0 0 9.88s
✅ MARKDOWN markdownlint 10 0 0 0 1.05s
✅ MARKDOWN markdown-table-formatter 10 0 0 0 0.32s
✅ REPOSITORY gitleaks yes no no 0.9s
✅ REPOSITORY git_diff yes no no 0.01s
⚠️ REPOSITORY grype yes no 1 27.44s
✅ REPOSITORY secretlint yes no no 0.97s
✅ REPOSITORY syft yes no no 1.99s
✅ REPOSITORY trivy yes no no 5.11s
✅ REPOSITORY trivy-sbom yes no no 0.25s
✅ REPOSITORY trufflehog yes no no 2.38s
✅ SPELL lychee 64 0 0 1.55s
✅ YAML prettier 26 0 0 0 1.18s
✅ YAML v8r 26 0 0 7.63s
✅ YAML yamllint 26 0 0 0.74s

Detailed Issues

⚠️ REPOSITORY / grype - 1 warning
warning: A medium vulnerability in python package: urllib3, version 1.26.20 was found at: /.devcontainer/cpp/requirements.txt

warning: 1 warnings emitted

See detailed reports in MegaLinter artifacts

Your project could benefit from a custom flavor, which would allow you to run only the linters you need, and thus improve runtime performances. (Skip this info by defining FLAVOR_SUGGESTIONS: false)

  • Documentation: Custom Flavors
  • Command: npx [email protected] --custom-flavor-setup --custom-flavor-linters ACTION_ACTIONLINT,DOCKERFILE_HADOLINT,GHERKIN_GHERKIN_LINT,JSON_V8R,JSON_PRETTIER,JSON_NPM_PACKAGE_JSON_LINT,MARKDOWN_MARKDOWNLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER,REPOSITORY_GIT_DIFF,REPOSITORY_GITLEAKS,REPOSITORY_GRYPE,REPOSITORY_SECRETLINT,REPOSITORY_SYFT,REPOSITORY_TRIVY,REPOSITORY_TRIVY_SBOM,REPOSITORY_TRUFFLEHOG,SPELL_LYCHEE,YAML_PRETTIER,YAML_YAMLLINT,YAML_V8R

MegaLinter is graciously provided by OX Security

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2025

📦 Container Size Analysis

Note

Comparing ghcr.io/philips-software/amp-devcontainer-cpp:edgeghcr.io/philips-software/amp-devcontainer-cpp:pr-953

📈 Size Comparison Table

OS/Platform Previous Current Change Trend
linux/amd64 696.53 MB 696.53 MB 1.26 kB (0%) 🔽
linux/arm64 679.5 MB 679.5 MB +90 B (+0%) 🔼

@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2025

Test Results

 4 files  ±0   4 suites  ±0   2m 29s ⏱️ +2s
30 tests ±0  30 ✅ ±0  0 💤 ±0  0 ❌ ±0 
64 runs  ±0  64 ✅ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 36b9281. ± Comparison against base commit 757e16a.

♻️ This comment has been updated with latest results.

@daantimmer daantimmer added this pull request to the merge queue Sep 30, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 30, 2025
@sonarqubecloud
Copy link

@rjaegers rjaegers enabled auto-merge September 30, 2025 07:50
@rjaegers rjaegers added this pull request to the merge queue Sep 30, 2025
Merged via the queue into main with commit 15518e3 Sep 30, 2025
34 checks passed
@rjaegers rjaegers deleted the ci/enable-merge-queue branch September 30, 2025 08:08
@github-actions
Copy link
Contributor

Pull Request Report (#953)

Static measures

Description Value
Number of added lines 3
Number of deleted lines 0
Number of changed files 3
Number of commits 2
Number of reviews 2
Number of comments (w/o review comments) 5
Number of reviews that contains a comment to resolve 1
Number of reviews that requested a change from the author 0
Number of reviews that approved the Pull Request 1
Get the total number of participants of a Pull Request 5

Time related measures

Description Value
PR lead time (from creation to close of PR) 1.5 Hours
Time that was spend on the branch before the PR was created 6.5 Min
Time that was spend on the branch before the PR was merged 1.6 Hours
Time to merge after last review 54.8 Min

Status check related measures

Description Value
Total runtime for last status check run (Workflow for PR) 35.3 Min
Total time spend in last status check run on PR 25 Min

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2025

🎉 Hooray! The changes in this pull request went live with the release of v6.5.0 🎉

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