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

Disable merge commits for jdt-incubator #3

Merged
merged 2 commits into from
Feb 12, 2024

Conversation

mickaelistria
Copy link
Contributor

Merge commit would make further attempt to merge it in upstream JDT harder. Let's disable those.

Merge commit would make further attempt to merge it in upstream JDT harder. Let's disable those.

Signed-off-by: Mickael Istria <mistria@redhat.com>
@mickaelistria mickaelistria requested review from a team as code owners February 12, 2024 08:21

This comment has been minimized.

@mickaelistria
Copy link
Contributor Author

@fbricon @rgrunber @gorkem @testforstephen I think this requires a project lead approval. Can you please review?

PR updates make rebase/review easier without necessarily involving the submitter for a rebase.

Signed-off-by: Mickael Istria <mistria@redhat.com>
Copy link

Diff for 426af2f:
Printing local diff:

Actions are indicated with the following symbols:
+   create
!   modify
!   forced update
-   delete

Organization eclipse.jdt.ls[id=eclipse-jdtls]
  there have been 3 validation infos, enable verbose output with '-v' to to display them.

  
!   repository[name="eclipse-jdt-core-incubator"] {
!     allow_merge_commit                = true -> false
!     allow_update_branch               = false -> true
!   }
  
  Plan: 0 to add, 2 to change, 0 to delete.
Canonical Diff for 426af2f:
Showing canonical diff:

Organization eclipse.jdt.ls[id=eclipse-jdtls]

--- canonical
+++ original
@@ -3,8 +3,6 @@
 orgs.newOrg('eclipse-jdtls') {
   _repositories+:: [
     orgs.newRepo('eclipse-jdt-core-incubator') {
-      allow_merge_commit: false
-      allow_update_branch: true
       default_branch: "master"
       delete_branch_on_merge: false
       dependabot_alerts_enabled: false
@@ -13,7 +11,6 @@
       secret_scanning_push_protection: "disabled"
       web_commit_signoff_required: false
       workflows+: {
-        actions_can_approve_pull_request_reviews: false
         default_workflow_permissions: "write"
       }
     }
@@ -85,9 +82,6 @@
           secret: "********"
         }
       ]
-      workflows+: {
-        actions_can_approve_pull_request_reviews: false
-      }
     }
   ]
   secrets+: [

@netomi netomi merged commit fe7e7b5 into eclipse-jdtls:main Feb 12, 2024
2 checks passed
@netomi
Copy link
Contributor

netomi commented Feb 12, 2024

changes are live.

@mickaelistria
Copy link
Contributor Author

Thank you!

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