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: apply protection rules to missing branches #2

Merged

Conversation

mattdibi
Copy link
Contributor

This PR updates the branch protection rules to cover the missing important branches

@mattdibi mattdibi requested a review from a team as a code owner September 30, 2024 15:47
Copy link
Contributor

This is your friendly self-service bot.

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 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)

Copy link
Contributor

This is your friendly self-service bot.

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

Additionally, mattdibi is a member of the following teams:

This comment has been minimized.

This comment has been minimized.

@mattdibi mattdibi force-pushed the ci/branch_protection_rules branch from 994e696 to d880fc1 Compare September 30, 2024 15:48

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

@mattdibi
Copy link
Contributor Author

mattdibi commented Sep 30, 2024

/otterdog validate info

This comment has been minimized.

Copy link
Contributor

This is your friendly self-service bot.
Please find below the validation of the requested configuration changes:

Diff for 3bd314e
Organization iot.kura[id=eclipse-kura]
  there have been 6 validation infos, enable verbose output with '-v' to to display them.

  
!   branch_protection_rule[pattern="develop", repository="kura"] {
!     required_status_checks            = "['eclipse-eca-validation:eclipsefdn/eca']" -> "['eclipse-eca-validation:eclipsefdn/eca', 'Lint PR', 'any:continuous-integration/jenkins/pr-merge']"
!   }

+  add branch_protection_rule[pattern="docs-develop", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "docs-develop"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }

+  add branch_protection_rule[pattern="release-*", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "release-*"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+      "Lint PR"
+      "any:continuous-integration/jenkins/pr-merge"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }

+  add branch_protection_rule[pattern="docs-release-*", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "docs-release-*"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }
  
  Plan: 3 to add, 1 to change, 0 to delete.

Copy link
Contributor

This is your friendly self-service bot. The current configuration is in-sync with the live settings. 🚀

@mattdibi mattdibi requested a review from MMaiero September 30, 2024 16:01
Copy link

@MMaiero MMaiero left a comment

Choose a reason for hiding this comment

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

This will protect the develop code branch, maintenance branches and documentation ones

Copy link
Contributor

This is your friendly self-service bot.
This Pull Request is eligible for auto-merging as it passed the following checks:

  • 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

In order to automatically merge and apply the changes, add a comment /otterdog merge. 🚀

@mattdibi
Copy link
Contributor Author

/otterdog merge

@eclipse-otterdog eclipse-otterdog bot merged commit 42ce6f9 into eclipse-kura:main Sep 30, 2024
3 checks passed
Copy link
Contributor

This is your friendly self-service bot.

The following changes have been successfully applied:

Organization iot.kura[id=eclipse-kura]
  there have been 6 validation infos, enable verbose output with '-v' to to display them.

  
!   branch_protection_rule[pattern="develop", repository="kura"] {
!     required_status_checks            = "['eclipse-eca-validation:eclipsefdn/eca']" -> "['eclipse-eca-validation:eclipsefdn/eca', 'Lint PR', 'any:continuous-integration/jenkins/pr-merge']"
!   }

+  add branch_protection_rule[pattern="docs-develop", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "docs-develop"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }

+  add branch_protection_rule[pattern="release-*", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "release-*"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+      "Lint PR"
+      "any:continuous-integration/jenkins/pr-merge"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }

+  add branch_protection_rule[pattern="docs-release-*", repository="kura"] {
+    allows_deletions                  = false
+    allows_force_pushes               = false
+    blocks_creations                  = false
+    bypass_force_push_allowances      = []
+    bypass_pull_request_allowances    = []
+    dismisses_stale_reviews           = true
+    is_admin_enforced                 = false
+    lock_allows_fetch_and_merge       = false
+    lock_branch                       = false
+    pattern                           = "docs-release-*"
+    require_last_push_approval        = true
+    required_approving_review_count   = "1"
+    required_status_checks            = [
+      "eclipse-eca-validation:eclipsefdn/eca"
+    ],
+    requires_code_owner_reviews       = false
+    requires_commit_signatures        = false
+    requires_conversation_resolution  = false
+    requires_deployments              = false
+    requires_linear_history           = false
+    requires_pull_request             = true
+    requires_status_checks            = true
+    requires_strict_status_checks     = true
+    restricts_pushes                  = false
+    restricts_review_dismissals       = false
+  }

  
  Applying changes:


  Done.
  
  Executed plan: 3 added, 1 changed, 0 deleted.

@mattdibi mattdibi deleted the ci/branch_protection_rules branch September 30, 2024 16:02
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