Zubin pushed to branch wip/gitlab-inputs at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -4,11 +4,11 @@ spec:
    4 4 
           default: "no"
    5 5 
           description: Release pipeline
    6 6 
           options: [ "yes", "no" ]
    7 
    -    full-ci:
    7 
    +    full_ci:
    8 8 
           default: "no"
    9 9 
           description: Run all validation jobs
    10 10 
           options: [ "yes", "no" ]
    11 
    -    LLVM backend:
    11 
    +    llvm_backend:
    12 12 
           default: "no"
    13 13 
           description: Run LLVM backend jobs
    14 14 
           options: [ "yes", "no" ]
    ... ... @@ -16,7 +16,7 @@ spec:
    16 16 
           default: "no"
    17 17 
           description: Run JavaScript backend jobs
    18 18 
           options: [ "yes", "no" ]
    19 
    -    RISC-V:
    19 
    +    riscv:
    20 20 
           default: "no"
    21 21 
           description: Run RISC-V jobs
    22 22 
           options: [ "yes", "no" ]
    ... ... @@ -24,19 +24,19 @@ spec:
    24 24 
           default: "no"
    25 25 
           description: Run WebAssembly backend jobs
    26 26 
           options: [ "yes", "no" ]
    27 
    -    FreeBSD:
    27 
    +    freebsd:
    28 28 
           default: "no"
    29 29 
           description: Run FreeBSD jobs
    30 30 
           options: [ "yes", "no" ]
    31 
    -    non-moving GC:
    31 
    +    nonmoving_gc:
    32 32 
           default: "no"
    33 33 
           description: Run non-moving GC jobs
    34 34 
           options: [ "yes", "no" ]
    35 
    -    IPE:
    35 
    +    ipe:
    36 36 
           default: "no"
    37 37 
           description: Run IPE data jobs
    38 38 
           options: [ "yes", "no" ]
    39 
    -    test-primops:
    39 
    +    test_primops:
    40 40 
           default: "no"
    41 41 
           description: Run test-primops jobs
    42 42 
           options: [ "yes", "no" ]

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -675,10 +675,10 @@ inputEqString :: String -> String -> Cond
    675 675 
     inputEqString var s =
    676 676 
       Cond $ "$[[ inputs." ++ var ++ " ]] == \"" ++ s ++ "\""
    677 677
    678 
    -inputOrLabelString :: String -> Cond
    679 
    -inputOrLabelString name =
    680 
    -  or_all [ inputEqString name "yes"
    681 
    -         , labelString name
    678 
    +inputOrLabelString :: String -> String -> Cond
    679 
    +inputOrLabelString input_name label_name =
    680 
    +  or_all [ inputEqString input_name "yes"
    681 
    +         , labelString label_name
    682 682 
              ]
    683 683
    684 684 
     branchStringExact :: String -> Cond
    ... ... @@ -756,22 +756,22 @@ ruleToCond Off Nightly = varIsNull "NIGHTLY"
    756 756
    757 757
    758 758 
     validateRuleString :: ValidateRule -> Cond
    759 
    -validateRuleString FullCI       = or_all [ inputOrLabelString "full-ci"
    759 
    +validateRuleString FullCI       = or_all [ inputOrLabelString "full_ci" "full-ci"
    760 760 
                                              , labelString "marge_bot_batch_merge_job"
    761 761 
                                              , branchStringExact "master"
    762 762 
                                              , branchStringLike "ghc-[0-9]+\\.[0-9]+"
    763 763 
                                              ]
    764 764 
     validateRuleString FastCI       = true
    765 765
    766 
    -validateRuleString LLVMBackend  = inputOrLabelString "LLVM backend"
    767 
    -validateRuleString JSBackend    = inputOrLabelString "javascript"
    768 
    -validateRuleString RiscV        = inputOrLabelString "RISC-V"
    769 
    -validateRuleString WasmBackend  = inputOrLabelString "wasm"
    770 
    -validateRuleString FreeBSDLabel = inputOrLabelString "FreeBSD"
    771 
    -validateRuleString NonmovingGc  = inputOrLabelString "non-moving GC"
    772 
    -validateRuleString IpeData      = inputOrLabelString "IPE"
    773 
    -validateRuleString TestPrimops  = inputOrLabelString "test-primops"
    774 
    -validateRuleString I386Backend  = inputOrLabelString "i386"
    766 
    +validateRuleString LLVMBackend  = inputOrLabelString "llvm_backend" "LLVM backend"
    767 
    +validateRuleString JSBackend    = inputOrLabelString "javascript" "javascript"
    768 
    +validateRuleString RiscV        = inputOrLabelString "riscv" "RISC-V"
    769 
    +validateRuleString WasmBackend  = inputOrLabelString "wasm" "wasm"
    770 
    +validateRuleString FreeBSDLabel = inputOrLabelString "freebsd" "FreeBSD"
    771 
    +validateRuleString NonmovingGc  = inputOrLabelString "nonmoving_gc" "non-moving GC"
    772 
    +validateRuleString IpeData      = inputOrLabelString "ipe" "IPE"
    773 
    +validateRuleString TestPrimops  = inputOrLabelString "test_primops" "test-primops"
    774 
    +validateRuleString I386Backend  = inputOrLabelString "i386" "i386"
    775 775 
     validateRuleString WinArm64     = and_all
    776 776 
                                         [ labelString "aarch64"
    777 777 
                                         , labelString "Windows"
    ... ... @@ -781,7 +781,7 @@ validateRuleString WinArm64LLVM = and_all
    781 781 
                                         , labelString "Windows"
    782 782 
                                         , validateRuleString LLVMBackend
    783 783 
                                         ]
    784 
    -validateRuleString LoongArch64  = inputOrLabelString "loongarch"
    784 
    +validateRuleString LoongArch64  = inputOrLabelString "loongarch" "loongarch"
    785 785
    786 786 
     ---------------------------------------------------------------------
    787 787 
     -- The Job type

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help