[PATCH] elfutils moved to main branch

[PATCH] elfutils moved to main branch

[Mark Wielaard]

---
 builder/master.cfg | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index 4a40edf..d6b4d47 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -314,6 +314,14 @@ def master_and_users_try_branches(ref):
     return True
   return False
 
+def main_and_users_try_branches(ref):
+  if ref == "refs/heads/main":
+    return True
+  match = re.match ("refs/heads/users/[a-zA-Z0-9]+/try-", ref)
+  if match:
+    return True
+  return False
+
 # For git maint branches (as gnu poke uses)
 def master_and_maint_branches(ref):
   if ref == "refs/heads/master":
@@ -337,7 +345,7 @@ c['change_source'].append(sourceware_gitpoller)
 
 elfutils_repourl='https://sourceware.org/git/elfutils.git'
 elfutils_gitpoller = changes.GitPoller(repourl=elfutils_repourl,
-                                       branches=master_and_users_try_branches,
+                                       branches=main_and_users_try_branches,
                                        buildPushesWithNoCommits=True,
                                        pollInterval=3*60,
                                        pollRandomDelayMax=2*60,
@@ -483,8 +491,8 @@ c['schedulers'].append(sourceware_reconfig_scheduler)
 elfutils_scheduler = schedulers.SingleBranchScheduler(
         name="elfutils",
         change_filter=util.ChangeFilter(project="elfutils",
-                                        branch="master"),
-        reason="elfutils project master branch update",
+                                        branch="main"),
+        reason="elfutils project main branch update",
         builderNames=["elfutils-centos-x86_64",
 #                      "elfutils-debian-arm64",
                       "elfutils-fedora-arm64",
@@ -528,11 +536,11 @@ c['schedulers'].append(elfutils_try_scheduler)
 elfutils_snapshot_scheduler = schedulers.Periodic(
         name="elfutils-snapshots",
         change_filter=util.ChangeFilter(project="elfutils",
-                                        branch="master"),
-        branch="master",
+                                        branch="main"),
+        branch="main",
         periodicBuildTimer=15*60, # 15 minutes in seconds
         onlyIfChanged=True,
-        reason="elfutils periodic project master branch snapshot",
+        reason="elfutils periodic project main branch snapshot",
         builderNames=["elfutils-snapshots-coverage"])
 c['schedulers'].append(elfutils_snapshot_scheduler)
 
-- 
2.41.0