From 0c1ea88e2c329b975755bedab4f3cba4af2347d6 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Sat, 23 Dec 2023 11:02:25 +0000 Subject: [PATCH] Allow "main" as a deployable branch Git repositories, including newlib-cygwin, are increasingly using "main" rather than "master" as the default branch name. As such, Scallywag should treat the two equivalently, rather than only allowing deployment from a branch called "master". --- carpetbag.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/carpetbag.py b/carpetbag.py index cc62748..afadd31 100644 --- a/carpetbag.py +++ b/carpetbag.py @@ -26,7 +26,8 @@ def deployable_token(tokens): def deployable_job(u): return ((u.status == 'build succeeded') and - (u.reference == 'refs/heads/master') and + ((u.reference == 'refs/heads/master') or + (u.reference == 'refs/heads/main')) and (u.package != 'playground'))