From: Paul Spooren <mail@aparcar.org>
Date: Thu, 13 Jun 2024 07:56:38 +0000 (+0200)
Subject: phase1: make IsNoMasterBuild function more flexible
X-Git-Tag: v16~2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c1aedf4cea4379e4b547668983bdcefac70714a1;p=buildbot.git

phase1: make IsNoMasterBuild function more flexible

Work with both master/main

Signed-off-by: Paul Spooren <mail@aparcar.org>
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 41968d6..cefeaf0 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -563,7 +563,8 @@ c["schedulers"].append(
 
 
 def IsNoMasterBuild(step):
-    return step.getProperty("branch") != "main"
+    branch = step.getProperty("branch")
+    return branch not in ["main", "master"]
 
 
 def IsUsignEnabled(step):