[buildbot] phase1: make IsNoMasterBuild function more flexible

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 10 12:10:50 PDT 2024


ynezz pushed a commit to buildbot.git, branch main:
https://git.openwrt.org/c1aedf4cea4379e4b547668983bdcefac70714a1

commit c1aedf4cea4379e4b547668983bdcefac70714a1
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Thu Jun 13 09:56:38 2024 +0200

    phase1: make IsNoMasterBuild function more flexible
    
    Work with both master/main
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 phase1/master.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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




More information about the lede-commits mailing list