phase1: make IsNoMasterBuild function more flexible
authorPaul Spooren <mail@aparcar.org>
Thu, 13 Jun 2024 07:56:38 +0000 (09:56 +0200)
committerPaul Spooren <mail@aparcar.org>
Wed, 7 Aug 2024 08:04:04 +0000 (10:04 +0200)
Work with both master/main

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

index 41968d6fd3ed9d39265005195658384cb8a5e88b..cefeaf0e44d1f20e89a037874a16d9802ec55214 100644 (file)
@@ -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):