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.

Sign up for GitHub

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

Jump to bottom

fix: preserve original docker config if credentialhelpers exists #30750

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Merge branch 'main' into cdkasset-docker-config

403697f
Select commit
Loading
Failed to load commit list.
Open

fix: preserve original docker config if credentialhelpers exists #30750

Merge branch 'main' into cdkasset-docker-config
403697f
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Aug 11, 2024 in 0s

8 potential rules

‼️ Action Required ‼️

The configuration uses the deprecated commit_message_template attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration.
A brownout is planned on August 26th, 2024.
This option will be removed on September 23rd, 2024.
For more information: https://docs.mergify.com/configuration/file-format/#queue-rules

‼️ Action Required ‼️

The configuration uses the deprecated merge_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration.
A brownout is planned on August 26th, 2024.
This option will be removed on September 23rd, 2024.
For more information: https://docs.mergify.com/configuration/file-format/#queue-rules

### Rule: automatic merge (queue)
  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge|no-squash|two-approvers)
  • status-success=validate-pr
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-neutral=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-skipped=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
  • -approved-reviews-by~=author
  • -closed
  • -draft [📌 queue requirement]
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • base!=release
  • status-success~=AWS CodeBuild us-east-1
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed

Rule: automatic merge (comment)

  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge|no-squash|two-approvers)
  • status-success=validate-pr
  • -approved-reviews-by~=author
  • -closed
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • base!=release
  • status-success~=AWS CodeBuild us-east-1

Rule: automatic merge (2+ approvers) (queue)

  • #approved-reviews-by>=2
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge|no-squash)
  • label~=two-approvers
  • status-success=validate-pr
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-neutral=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-skipped=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
  • -approved-reviews-by~=author
  • -closed
  • -draft [📌 queue requirement]
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • base!=release
  • status-success~=AWS CodeBuild us-east-1
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed

Rule: automatic merge (2+ approvers) (comment)

  • #approved-reviews-by>=2
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge|no-squash)
  • label~=two-approvers
  • status-success=validate-pr
  • -approved-reviews-by~=author
  • -closed
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • base!=release
  • status-success~=AWS CodeBuild us-east-1

Rule: automatic merge (no-squash) (queue)

  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge)
  • label~=no-squash
  • status-success=validate-pr
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-neutral=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-skipped=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
  • -approved-reviews-by~=author
  • -closed
  • -draft [📌 queue requirement]
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • status-success~=AWS CodeBuild us-east-1
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed

Rule: automatic merge (no-squash) (comment)

  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge)
  • label~=no-squash
  • status-success=validate-pr
  • -approved-reviews-by~=author
  • -closed
  • -merged
  • -title~=(WIP|wip)
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • status-success~=AWS CodeBuild us-east-1

Rule: remove stale reviews (dismiss_reviews)

  • changes-requested-reviews-by!=aws-cdk-automation
  • -closed
  • -merged
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
  • base=main
  • label!=contribution/core

Rule: if fails conventional commits (comment)

  • status-failure=Semantic Pull Request
  • -closed
  • -merged
  • author!=dependabot-preview[bot]
  • author!=dependabot[bot]
💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!

3 not applicable rules

Rule: label core (label)

  • author~=^(rix0rrr|iliapolo|otaviomacedo|kaizencc|comcalvi|TheRealAmazonKendra|vinayak-kukreja|mrgrain|pahud|cgarvis|kellertk|HBobertz|sumupitchayan|SankyRed|udaypant|colifran|scanlonp|mikewrighton|moelasmar|paulhcsun|awsmjs|evgenyka|GavinZZ|aaythapa|xazhao|ConnorRobertson|ssenchenko|gracelu0|jfuss|SimonCMoore|shikha372|kirtishrinkhala|godwingrs22|bergjaak|samson-keung|IanKonlog|Leo10Gama|scorbiere)$
  • -label~="contribution/core"

Rule: automatic merge of Dependabot PRs (queue)

  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge)
  • author~=dependabot
  • status-success=validate-pr
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by>=1 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-success=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-neutral=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
        • check-skipped=AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)
  • -closed
  • -draft [📌 queue requirement]
  • -merged
  • -title~=(WIP|wip)
  • status-success~=AWS CodeBuild us-east-1
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed

Rule: automatic merge of Dependabot PRs (comment)

  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • -label~=(blocked|do-not-merge)
  • author~=dependabot
  • status-success=validate-pr
  • -closed
  • -merged
  • -title~=(WIP|wip)
  • status-success~=AWS CodeBuild us-east-1
Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

View more details on Mergify