From 61eaaea5494252f752c0d2892b72739aca791a1e Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 3 Mar 2024 13:28:20 +0100 Subject: [PATCH 1/4] Set homepage as plugins.jenkins.io for new plugins Signed-off-by: Alexander Brandes --- pom.xml | 2 +- .../infra/repository_permissions_updater/hosting/Hoster.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04fb64a2fb..8529610878 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ org.kohsuke github-api - 1.318 + 1.319 org.javatuples diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java index d028a35fd7..87bd3fd751 100644 --- a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java +++ b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java @@ -251,6 +251,7 @@ boolean forkGitHub(String owner, String repo, String newName, List maint private static void setupRepository(GHRepository r, boolean useGHIssues) throws IOException { r.enableIssueTracker(useGHIssues); r.enableWiki(false); + r.setHomepage("https://plugins.jenkins.io/" + r.getName().replace("-plugin", "") + "/"); } /** From e6701d58fe7d3a37e46088b7d74f430b90ba0b25 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 3 Mar 2024 13:37:58 +0100 Subject: [PATCH 2/4] Update defaults Signed-off-by: Alexander Brandes --- .../infra/repository_permissions_updater/hosting/Hoster.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java index 87bd3fd751..235af15647 100644 --- a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java +++ b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java @@ -252,6 +252,8 @@ private static void setupRepository(GHRepository r, boolean useGHIssues) throws r.enableIssueTracker(useGHIssues); r.enableWiki(false); r.setHomepage("https://plugins.jenkins.io/" + r.getName().replace("-plugin", "") + "/"); + r.setEmailServiceHook("jenkinsci-commits@googlegroups.com"); + r.setDefaultBranch("main"); } /** From abf3d98311ba81afcd7b96a0c2baddc62fe0edc2 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 3 Mar 2024 13:42:15 +0100 Subject: [PATCH 3/4] Update default branch check Signed-off-by: Alexander Brandes --- .../infra/repository_permissions_updater/hosting/Hoster.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java index 235af15647..012278abc0 100644 --- a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java +++ b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java @@ -253,7 +253,9 @@ private static void setupRepository(GHRepository r, boolean useGHIssues) throws r.enableWiki(false); r.setHomepage("https://plugins.jenkins.io/" + r.getName().replace("-plugin", "") + "/"); r.setEmailServiceHook("jenkinsci-commits@googlegroups.com"); - r.setDefaultBranch("main"); + if (!r.getDefaultBranch().equals("main")) { + r.setDefaultBranch("main"); + } } /** From e84073b13b7053438759dd9e54e4c6166579d927 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 3 Mar 2024 14:31:09 +0100 Subject: [PATCH 4/4] Update src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java --- .../infra/repository_permissions_updater/hosting/Hoster.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java index 012278abc0..4209aa0e00 100644 --- a/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java +++ b/src/main/java/io/jenkins/infra/repository_permissions_updater/hosting/Hoster.java @@ -252,7 +252,6 @@ private static void setupRepository(GHRepository r, boolean useGHIssues) throws r.enableIssueTracker(useGHIssues); r.enableWiki(false); r.setHomepage("https://plugins.jenkins.io/" + r.getName().replace("-plugin", "") + "/"); - r.setEmailServiceHook("jenkinsci-commits@googlegroups.com"); if (!r.getDefaultBranch().equals("main")) { r.setDefaultBranch("main"); }