.gitlab/generate-ci/gen_ci.hs

@@ -541,8 +541,8 @@ data OnOffRules = OnOffRules { rule_set :: Rule -- ^ The enabled rules
                              }
 
 -- The initial set of rules, which assumes a Validate pipeline which is run with FullCI.
-emptyRules :: OnOffRules
-emptyRules = OnOffRules (ValidateOnly (S.singleton FullCI)) OnSuccess
+emptyRules :: String -> OnOffRules
+emptyRules jobName = OnOffRules (ValidateOnly jobName (S.fromList [FullCI])) OnSuccess
 
 -- When to run the job
 data ManualFlag = Manual -- ^ Only run the job when explicitly triggered by a user
@@ -559,10 +559,10 @@ onlyValidateRule :: ValidateRule -> OnOffRules -> OnOffRules
 onlyValidateRule r  = modifyValidateRules (const (S.singleton r))
 
 removeValidateRule :: ValidateRule -> OnOffRules -> OnOffRules
-removeValidateRule r = modifyValidateRules (S.delete r)
+removeValidateRule v = modifyValidateRules (S.delete v)
 
 modifyValidateRules :: (S.Set ValidateRule -> S.Set ValidateRule) -> OnOffRules -> OnOffRules
-modifyValidateRules f (OnOffRules (ValidateOnly rs) m) = OnOffRules (ValidateOnly (f rs)) m
+modifyValidateRules f (OnOffRules (ValidateOnly s rs) m) = OnOffRules (ValidateOnly s (f rs)) m
 modifyValidateRules _ r = error $ "Applying validate rule to nightly/release job:" ++ show (rule_set r)
 
 manualRule :: OnOffRules -> OnOffRules
@@ -575,13 +575,13 @@ enumRules :: OnOffRules -> [OnOffRule]
 enumRules (OnOffRules r _) = rulesList
   where
     rulesList = case r of
-                  ValidateOnly rs -> [OnOffRule On (ValidateOnly rs)
+                  ValidateOnly s rs -> [OnOffRule On (ValidateOnly s rs)
                                     , OnOffRule Off ReleaseOnly
                                     , OnOffRule Off Nightly ]
-                  Nightly -> [ OnOffRule Off (ValidateOnly S.empty)
+                  Nightly -> [ OnOffRule Off (ValidateOnly "" S.empty)
                              , OnOffRule Off ReleaseOnly
                              , OnOffRule On Nightly ]
-                  ReleaseOnly -> [ OnOffRule Off (ValidateOnly S.empty)
+                  ReleaseOnly -> [ OnOffRule Off (ValidateOnly "" S.empty)
                                  , OnOffRule On ReleaseOnly
                                  , OnOffRule Off Nightly ]
 
@@ -619,11 +619,12 @@ or_all rs = intercalate " || " (map parens rs)
 -- run the job.
 data Rule = ReleaseOnly  -- ^ Only run this job in a release pipeline
           | Nightly      -- ^ Only run this job in the nightly pipeline
-          | ValidateOnly (S.Set ValidateRule) -- ^ Only run this job in a validate pipeline, when any of these rules are enabled.
+          | ValidateOnly String (S.Set ValidateRule) -- ^ Only run this job in a validate pipeline, when any of these rules are enabled.
           deriving (Show, Ord, Eq)
 
 data ValidateRule =
             FullCI       -- ^ Run this job when the "full-ci" label is present.
+          | FastCI       -- ^ Run this job on every validation pipeline
           | LLVMBackend  -- ^ Run this job when the "LLVM backend" label is present
           | JSBackend    -- ^ Run this job when the "javascript" label is present
           | WasmBackend  -- ^ Run this job when the "wasm" label is present
@@ -631,7 +632,7 @@ data ValidateRule =
           | NonmovingGc  -- ^ Run this job when the "non-moving GC" label is set.
           | IpeData      -- ^ Run this job when the "IPE" label is set
           | TestPrimops  -- ^ Run this job when "test-primops" label is set
-          deriving (Show, Enum, Bounded, Ord, Eq)
+          deriving (Show, Ord, Eq)
 
 -- A constant evaluating to True because gitlab doesn't support "true" in the
 -- expression language.
@@ -644,25 +645,43 @@ _false = "\"disabled\" != \"disabled\""
 
 -- Convert the state of the rule into a string that gitlab understand.
 ruleString :: OnOff -> Rule -> String
-ruleString On (ValidateOnly vs) =
-  case S.toList vs of
-    [] -> true
-    conds -> or_all (map validateRuleString conds)
+ruleString On (ValidateOnly only_job_name vs) =
+  let conds = S.toList vs
+      empty_only_job = envVarNull "ONLY_JOBS"
+      run_cond = case conds of
+                  [] -> _false
+                  cs -> or_all (map validateRuleString conds)
+      escape :: String -> String
+      escape = concatMap (\c -> if c == '+' then "\\+" else [c])
+
+  in
+    or_all  [
+    -- 1. Case when ONLY_JOBS is set
+      and_all [ "$ONLY_JOBS", "$ONLY_JOBS =~ /.*\\b" ++  escape only_job_name ++ "(\\s|$).*/" ]
+    -- 2. Case when ONLY_JOBS is null
+    , and_all [ empty_only_job, run_cond ]
+    ]
 ruleString Off (ValidateOnly {}) = true
 ruleString On ReleaseOnly = "$RELEASE_JOB == \"yes\""
 ruleString Off ReleaseOnly = "$RELEASE_JOB != \"yes\""
 ruleString On Nightly = "$NIGHTLY"
-ruleString Off Nightly = "$NIGHTLY == null"
+ruleString Off Nightly = envVarNull "NIGHTLY"
 
 labelString :: String -> String
 labelString s =  "$CI_MERGE_REQUEST_LABELS =~ /.*" ++ s ++ ".*/"
 
 branchStringExact :: String -> String
-branchStringExact s = "$CI_COMMIT_BRANCH == \"" ++ s ++ "\""
+branchStringExact s = envVarString "CI_COMMIT_BRANCH" s
 
 branchStringLike :: String -> String
 branchStringLike s = "$CI_COMMIT_BRANCH =~ /" ++ s ++ "/"
 
+envVarString :: String -> String -> String
+envVarString var s = "$" ++ var ++ " == \"" ++ s ++ "\""
+
+envVarNull :: String ->  String
+envVarNull var = "$" ++ var ++ " == null"
+
 
 validateRuleString :: ValidateRule -> String
 validateRuleString FullCI = or_all ([ labelString "full-ci"
@@ -670,6 +689,7 @@ validateRuleString FullCI = or_all ([ labelString "full-ci"
                                     , branchStringExact "master"
                                     , branchStringLike "ghc-[0-9]+\\.[0-9]+"
                                     ])
+validateRuleString FastCI = true
 
 validateRuleString LLVMBackend  = labelString "LLVM backend"
 validateRuleString JSBackend    = labelString "javascript"
@@ -725,7 +745,7 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} }
   where
     jobPlatform = (arch, opsys)
 
-    jobRules = emptyRules
+    jobRules = emptyRules jobName
 
     jobName = testEnv arch opsys buildConfig
 
@@ -917,7 +937,7 @@ perfProfilingJobTag arch opsys j = j { jobTags = [ runnerPerfTag arch opsys ] }
 -- | Mark the validate job to run in fast-ci mode
 -- This is default way, to enable all jobs you have to apply the `full-ci` label.
 fastCI :: JobGroup Job -> JobGroup Job
-fastCI = modifyValidateJobs (removeValidateJobRule FullCI)
+fastCI = onlyRule FastCI
 
 -- | Mark a group of jobs as allowed to fail.
 allowFailureGroup :: JobGroup Job -> JobGroup Job
@@ -934,8 +954,10 @@ onlyRule t = modifyValidateJobs (onlyValidateJobRule t)
 
 -- | Don't run the validate job, normally used to alleviate CI load by marking
 -- jobs which are unlikely to fail (ie different linux distros)
+--
+-- These jobs can still be triggered by using the ONLY_JOBS environment variable
 disableValidate :: JobGroup Job -> JobGroup Job
-disableValidate st = st { v = Nothing }
+disableValidate = modifyValidateJobs (removeValidateJobRule FastCI . removeValidateJobRule FullCI)
 
 data NamedJob a = NamedJob { name :: String, jobInfo :: a } deriving (Show, Functor)
 

compiler/ghc.cabal.in

@@ -114,7 +114,7 @@ Library
         extra-libraries: zstd
       CPP-Options: -DHAVE_LIBZSTD
 
-    Build-Depends: base       >= 4.11 && < 4.21,
+    Build-Depends: base       >= 4.11 && < 4.22,
                    deepseq    >= 1.4 && < 1.6,
                    directory  >= 1   && < 1.4,
                    process    >= 1   && < 1.7,

configure.ac

@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.12], [glasgow-hask
 AC_CONFIG_MACRO_DIRS([m4])
 
 # Set this to YES for a released version, otherwise NO
-: ${RELEASE=YES}
+: ${RELEASE=NO}
 
 # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
 # above.  If this is not a released version, then we will append the

Cabal @ 6eb0369e

-Subproject commit 2a48e40fdf320caa4240ce8eb28841e31f4f3de3
+Subproject commit 6eb0369e3f736ef62192a5760a9fce3b1a989543

array @ a8ec1173

-Subproject commit c9cb2c1e8762aa83b6e77af82c87a55e03e990e4
+Subproject commit a8ec1173bce79b12ad5a7d2581b8a0862432f311

libraries/base/base.cabal.in

@@ -4,7 +4,7 @@ cabal-version:  3.0
 -- Make sure you are editing ghc-experimental.cabal.in, not ghc-experimental.cabal
 
 name:           base
-version:        4.20.0.0
+version:        4.21.0.0
 -- NOTE: Don't forget to update ./changelog.md
 
 license:        BSD-3-Clause

deepseq @ af115cc2

-Subproject commit 7ce6e2d3760b23336fd5f9a36f50df6571606947
+Subproject commit af115cc226cc87fba89d0f6e2e9212e755c24983

directory @ 0c88ffff

-Subproject commit 6045b93c4ef7a713c8f3d6837ca69f8e96b12bf1
+Subproject commit 0c88ffff883d33df96b50879d1983a67e9dfeb81

filepath @ bf2374dd

-Subproject commit 87a09e296ea6fc137a0b32edda1bd0f54332642e
+Subproject commit bf2374ddfd7b2e5ba4e69d5ffbf4ebf6286c9c22

libraries/ghc-boot-th/ghc-boot-th.cabal.in

@@ -49,7 +49,7 @@ Library
             GHC.Lexeme
 
     build-depends:
-        base       >= 4.7 && < 4.21,
+        base       >= 4.7 && < 4.22,
         ghc-prim,
         pretty      == 1.1.*
 

libraries/ghc-boot/ghc-boot.cabal.in

@@ -75,7 +75,7 @@ Library
             GHC.Version
             GHC.Platform.Host
 
-    build-depends: base       >= 4.7 && < 4.21,
+    build-depends: base       >= 4.7 && < 4.22,
                    binary     == 0.8.*,
                    bytestring >= 0.10 && < 0.13,
                    containers >= 0.5 && < 0.8,

libraries/ghc-compact/ghc-compact.cabal

@@ -40,7 +40,7 @@ library
     CPP
 
   build-depends: ghc-prim   >= 0.5.3 && < 0.12,
-                 base       >= 4.9.0 && < 4.21,
+                 base       >= 4.9.0 && < 4.22,
                  bytestring >= 0.10.6.0 && <0.13
   ghc-options: -Wall
 

libraries/ghc-experimental/ghc-experimental.cabal.in

@@ -39,7 +39,7 @@ library
     if arch(wasm32)
         exposed-modules:  GHC.Wasm.Prim
     other-extensions:
-    build-depends:    base ^>=4.20,
+    build-depends:    base >=4.20 && < 4.22,
                       ghc-internal == @ProjectVersionForLib@.*,
                       ghc-prim >= 0.11 && < 0.12
     hs-source-dirs:   src

libraries/ghci/ghci.cabal.in

@@ -84,7 +84,7 @@ library
     Build-Depends:
         rts,
         array            == 0.5.*,
-        base             >= 4.8 && < 4.21,
+        base             >= 4.8 && < 4.22,
         -- ghc-internal     == @ProjectVersionForLib@.*
         -- TODO: Use GHC.Internal.Desugar and GHC.Internal.Base from
         -- ghc-internal instead of ignoring the deprecation warning in GHCi.TH

haskeline @ 5f4bf62b

-Subproject commit 76157646fb5836fc022e770f7db2156661e899c3
+Subproject commit 5f4bf62bf1f4846ad0b8d1fa9d45f902e3934511

hpc @ 9e29abb7

-Subproject commit 4989c41b96c7c9ca09a6687da638ac28f3d3688b
+Subproject commit 9e29abb785ab4f82c37c7a4e73ec999083955b09

os-string @ 1d0553e2

-Subproject commit 6d31aafde2f7b8c3050ffee7dd9f658225cfd1a4
+Subproject commit 1d0553e20499d4bbaefe30d0489a08bc3523d331

parsec @ 903f9d85

-Subproject commit 9c071b05fbb077afbaf0dd2dfdab21265859ae91
+Subproject commit 903f9d8561a23376d26a7b857aa9fa5b35531d6f

process @ 8364eaa2

-Subproject commit a53f925e3ee246e2429418b7a088ecaa0976007b
+Subproject commit 8364eaa2c83f7918be41cf3bd520e4ede1b07c35