From f8e46dbf6bb04ccebf1f1f7707a8a7f0274306f8 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Feb 03 2021 16:44:23 +0000 Subject: Update branches to rename master into rawhide This change also ensure the Rawhide branch matcher also match the main branch, in case a PR is open on the symbolic name. --- diff --git a/FZCI.dhall/Branches.dhall b/FZCI.dhall/Branches.dhall index 6b57614..02a742b 100644 --- a/FZCI.dhall/Branches.dhall +++ b/FZCI.dhall/Branches.dhall @@ -5,32 +5,43 @@ let Arches = ./Arches.dhall let --| When changing that union, update the `all` attribute too Union = - < Master | F32 | F33 | Epel8 > + < Rawhide | F32 | F33 | Epel8 > -let eq_def = { Master = False, F32 = False, F33 = False, Epel8 = False } +let eq_def = { Rawhide = False, F32 = False, F33 = False, Epel8 = False } let show = λ(branch : Union) → merge - { Master = "master", F32 = "f32", F33 = "f33", Epel8 = "epel8" } + { Rawhide = "rawhide", F32 = "f32", F33 = "f33", Epel8 = "epel8" } branch -let all = [ Union.Master, Union.F33, Union.F32, Union.Epel8 ] +let all = [ Union.Rawhide, Union.F33, Union.F32, Union.Epel8 ] + +let isRawhide = λ(branch : Union) → merge (eq_def ⫽ { Rawhide = True }) branch in { Type = Union - , default = Union.Master + , default = Union.Rawhide , all - , allText = Prelude.List.map Union Text show all + , allText = Prelude.List.map Union Text show all # [ "main" ] , show + , zuulBranch = + λ(branch : Union) → + Some + ( [ show branch ] + # ( if isRawhide branch + then [ "main" ] + else Prelude.List.empty Text + ) + ) , target = λ(branch : Union) → merge - { Master = "rawhide", F32 = "f32", F33 = "f33", Epel8 = "epel8" } + { Rawhide = "rawhide", F32 = "f32", F33 = "f33", Epel8 = "epel8" } branch , arches = λ(branch : Union) → merge - { Master = Arches.fedora + { Rawhide = Arches.fedora , F32 = Arches.fedora , F33 = Arches.fedora , Epel8 = Arches.epel8 @@ -39,7 +50,7 @@ in { Type = Union , kojirepos = λ(branch : Union) → merge - { Master = + { Rawhide = "https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/" , F32 = "https://kojipkgs.fedoraproject.org/repos/f32-build/latest/x86_64/" @@ -49,6 +60,6 @@ in { Type = Union "https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/" } branch - , isMaster = λ(branch : Union) → merge (eq_def ⫽ { Master = True }) branch + , isRawhide , isEpel8 = λ(branch : Union) → merge (eq_def ⫽ { Epel8 = True }) branch }