Skip to content

Enable Merge Queue on DevContainer repsository#134

Open
opajonk wants to merge 5 commits intoeclipse-score:mainfrom
elektrobit-contrib:enable_merge_queue_for_devcontainer
Open

Enable Merge Queue on DevContainer repsository#134
opajonk wants to merge 5 commits intoeclipse-score:mainfrom
elektrobit-contrib:enable_merge_queue_for_devcontainer

Conversation

@opajonk
Copy link

@opajonk opajonk commented Feb 2, 2026

We want to trial merge queues for Eclipse S-CORE. We chose the DevContainer repository as a trial repository.

@opajonk
Copy link
Author

opajonk commented Feb 2, 2026

@opajonk
Copy link
Author

opajonk commented Feb 2, 2026

For anyone who is interested, I checked the Otterdog ReadTheDocs for how the syntax of these settings should be.

@opajonk opajonk force-pushed the enable_merge_queue_for_devcontainer branch from 12ec3da to e65dfc9 Compare February 2, 2026 16:46
We want to trial merge queues for Eclipse S-CORE. We chose this repository as a trial repository.
@opajonk opajonk force-pushed the enable_merge_queue_for_devcontainer branch from e65dfc9 to bc55329 Compare February 2, 2026 16:47
@opajonk
Copy link
Author

opajonk commented Feb 2, 2026

Depends on eclipse-score/devcontainer#72

@opajonk opajonk force-pushed the enable_merge_queue_for_devcontainer branch from e7b773f to a6e2db2 Compare February 3, 2026 07:25
Co-authored-by: Alexander Lanin <alex@lanin.de>
Signed-off-by: Oliver Pajonk <oliver.pajonk@elektrobit.com>
@opajonk opajonk force-pushed the enable_merge_queue_for_devcontainer branch from a6e2db2 to b9fccf3 Compare February 3, 2026 07:26
@FScholPer
Copy link
Contributor

@opajonk Please open for review or close!

@opajonk
Copy link
Author

opajonk commented Mar 4, 2026

Depends on eclipse-score/devcontainer#72 where I am waiting for approval and merge

@opajonk opajonk marked this pull request as ready for review March 11, 2026 08:57
@opajonk opajonk requested a review from a team as a code owner March 11, 2026 08:57
@eclipse-otterdog
Copy link
Contributor

Thank you for raising a pull request to update the configuration of your GitHub organization.
You can manually add reviewers to this PR to eventually enable auto-merging.

The following conditions need to be fulfilled for auto-merging to be available:

  • valid configuration
  • approved by a project lead
  • does not require any secrets
  • does not update settings only accessible via the GitHub Web UI
  • does not remove any resource
Otterdog commands and options

You can trigger otterdog actions by commenting on this PR:

  • /otterdog team-info checks the team / org membership for the PR author
  • /otterdog validate validates the configuration change
  • /otterdog validate info validates the configuration change, printing also validation infos
  • /otterdog check-sync checks if the base ref is in sync with live settings
  • /otterdog merge merges and applies the changes if the PR is eligible for auto-merging (only accessible for the author)
  • /otterdog done notifies the self-service bot that a required manual apply operation has been performed (only accessible for members of the admin team)
  • /otterdog apply re-apply a previously failed attempt (only accessible for members of the admin team)

@eclipse-otterdog
Copy link
Contributor

The author (opajonk) of this PR is associated with this organization in the role of MEMBER.

Additionally, opajonk is a member of the following teams:

@eclipse-otterdog
Copy link
Contributor

Please find below the validation of the requested configuration changes:

Diff for 819c94e
Project automotive.score[github_id=eclipse-score]
  there have been 34 validation infos, enable verbose output to display them.

  
!   repository[name="devcontainer"] {
!     description                 = "Common Devcontainer for Eclipse S-CORE" -> "Common DevContainer for Eclipse 
S-CORE"
!     squash_merge_commit_message = "COMMIT_MESSAGES" -> "PR_BODY"
!     squash_merge_commit_title   = "COMMIT_OR_PR_TITLE" -> "PR_TITLE"
!   }

  
!   repo_ruleset[name="main", repository=devcontainer] {
!     include_refs                                         = [
!       "refs/heads/main" -> "~DEFAULT_BRANCH"
!     ]
!     required_merge_queue                                 = {
+      build_concurrency                                    = 5
+      max_group_size                                       = 5
+      merge_method                                         = "SQUASH"
+      min_group_size                                       = 1
+      requires_all_group_entries_to_pass_required_checks   = true
+      status_check_timeout                                 = 60
+      wait_time_for_minimum_group_size                     = 5
!     }
!     required_status_checks                               = {
!       status_checks                                        = [
+        "build/overall-result"
!       ]
!     }
!   }
  
  Plan: 0 to add, 6 to change, 0 to delete.

@eclipse-otterdog
Copy link
Contributor

Note

The current configuration is out-of-sync with the live settings:

Diff to live settings
Project automotive.score[github_id=eclipse-score]
  there have been 34 validation infos, enable verbose output to display them.

-  remove environment[name="copilot", repository=reference_integration] {
-    deployment_branch_policy = "all"
-    name                     = "copilot"
-    reviewers                = []
-    wait_timer               = 0
-  }

  
!   repository[name="baselibs"] {
!     code_scanning_default_setup_enabled = true -> false
!   }

+  add repo_webhook[url="https://app.readthedocs.org/api/v2/webhook/score-communication/319863/", 
repository=communication] {
+    active       = true
+    content_type = "json"
+    events       = [
+      "push"
+      "pull_request"
+      "create"
+      "delete"
+    ],
+    insecure_ssl = "0"
+    secret       = "pass:bots/automotive.score/readthedocs.org/webhook_secret"
+  }

  
!   repository[name="testing_tools"] {
!     code_scanning_default_languages = [
-      "actions"
!     ]
!   }

  
!   branch_protection_rule[pattern="main", repository=kyron] {
!     requires_linear_history = false -> true
!   }
  
  Plan: 1 to add, 3 to change, 1 to delete.

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.

4 participants