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

Theedge 3710: Add activation key to image model and add it on image builder request #2360

Merged
merged 9 commits into from
Jan 18, 2024

Merge branch 'main' into THEEDGE-3710

f486d40
Select commit
Loading
Failed to load commit list.
Merged

Theedge 3710: Add activation key to image model and add it on image builder request #2360

Merge branch 'main' into THEEDGE-3710
f486d40
Select commit
Loading
Failed to load commit list.
This check has been archived and is scheduled for deletion. Learn more about checks retention
Mergify / Summary succeeded Feb 1, 2024 in 3s

10 rules match and 10 potential rules

✅ Rule: Remove outdated reviews (dismiss_reviews)

  • base=main

Rule: Check for unresolved conversations before merging (comment, label)

  • #review-threads-unresolved>0

✅ Rule: Remove question label from resolved conversations (label)

  • #review-threads-unresolved=0

Rule: Request PR check re-run (comment, label)

  • all of:
    • any of:
      • -check-success=Lint
      • -check-success=ci.int.devshift.net PR build
    • base=main
    • label!=do not merge
    • label!=work in progress
    • updated-at<1 days ago
    • all of:
      • #approved-reviews-by>=2
      • #changes-requested-reviews-by=0
      • #review-threads-unresolved=0

✅ Rule: Automatic merge on approval (queue)

  • -draft [📌 queue requirement]
  • base=main
  • check-success=Lint
  • check-success=ci.int.devshift.net PR build
  • label!=do not merge
  • label!=work in progress
  • all of:
    • #approved-reviews-by>=2
    • #changes-requested-reviews-by=0
    • #review-threads-unresolved=0
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed
  • any of: [🔀 queue conditions]
    • all of [📌 queue conditions of queue edge-api]

✅ Rule: Automatic merge on approval (label)

  • base=main
  • check-success=Lint
  • check-success=ci.int.devshift.net PR build
  • label!=do not merge
  • label!=work in progress
  • all of:
    • #approved-reviews-by>=2
    • #changes-requested-reviews-by=0
    • #review-threads-unresolved=0

Rule: warn on conflicts (comment, label)

  • conflict

✅ Rule: remove conflict label if not needed (label)

  • -conflict

Rule: close stale pull request (close)

  • -closed
  • base=main
  • updated-at<14 days ago

Rule: waiting for review (label)

  • #commented-reviews-by<2
  • -draft
  • created-at<1 days ago

✅ Rule: remove waiting for review label if not needed (label)

  • #commented-reviews-by>=2
  • -draft

Rule: add bug fix label (label)

  • body~=(?m)^- \[[xX]\] Bug fix \(non-breaking change which fixes an issue\)

✅ Rule: add new feature label (label)

  • body~=(?m)^- \[[xX]\] New feature \(non-breaking change which adds functionality\)

Rule: add documentation label (label)

  • body~=(?m)^- \[[xX]\] Documentation update

Rule: add test update label (label)

  • body~=(?m)^- \[[xX]\] Tests update

✅ Rule: remove bug fix label (label)

  • body~=(?m)^- \[ \] Bug fix \(non-breaking change which fixes an issue\)

Rule: remove new feature label (label)

  • body~=(?m)^- \[ \] New feature \(non-breaking change which adds functionality\)

✅ Rule: remove documentation label (label)

  • body~=(?m)^- \[ \] Documentation update

✅ Rule: remove test update label (label)

  • body~=(?m)^- \[ \] Tests update

Rule: add ready label (label)

  • body~=(?m)^- \[[xX]\] I have added tests that prove my fix is effective or that my feature works
  • body~=(?m)^- \[[xX]\] I have commented my code, particularly in hard-to-understand areas
  • body~=(?m)^- \[[xX]\] I have made corresponding changes to the documentation
  • body~=(?m)^- \[[xX]\] I run make pre-commit to check fmt\/vet\/lint\/test-no-fdo
  • body~=(?m)^- \[[xX]\] New and existing unit tests pass locally with my changes

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


1 not applicable rule

Rule: Automatic merge for Dependabot pull requests (queue)

  • author~=^dependabot(|-preview)\[bot\]$
  • -draft [📌 queue requirement]
  • check-success=Lint
  • all of:
    • #approved-reviews-by>=2
    • #changes-requested-reviews-by=0
    • #review-threads-unresolved=0
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success=Configuration changed
  • any of: [🔀 queue conditions]
    • all of [📌 queue conditions of queue edge-api]
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