summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2023-01-28 10:17:37 +0000
committerMatthew Pickering <matthewtpickering@gmail.com>2023-01-28 10:17:37 +0000
commit19a68c780d99687e7eb0bb9ab1bb7018ef671006 (patch)
treed82b12984880d0dd248c9f51ca0101dc0288113f
parente740dd68b86a7b55e040dade07eed92a1777f3de (diff)
downloadhaskell-19a68c780d99687e7eb0bb9ab1bb7018ef671006.tar.gz
gen_ci: Only consider release jobs for job metadataghc-9.6.1-alpha2
In particular we do not have a release job for FreeBSD so the generation of the platform mapping was failing.
-rwxr-xr-x.gitlab/gen_ci.hs5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs
index 147999bd14..7100b912ee 100755
--- a/.gitlab/gen_ci.hs
+++ b/.gitlab/gen_ci.hs
@@ -17,7 +17,6 @@ import Data.List (intercalate)
import Data.Set (Set)
import qualified Data.Set as S
import System.Environment
-import Data.Maybe
{-
Note [Generating the CI pipeline]
@@ -931,7 +930,7 @@ mkPlatform arch opsys = archName arch <> "-" <> opsysName opsys
-- * Explicitly require tie-breaking for other cases.
platform_mapping :: Map String (JobGroup BindistInfo)
platform_mapping = Map.map go $
- Map.fromListWith combine [ (uncurry mkPlatform (jobPlatform (jobInfo $ v j)), j) | j <- job_groups ]
+ Map.fromListWith combine [ (uncurry mkPlatform (jobPlatform (jobInfo $ v j)), j) | j <- filter hasReleaseBuild job_groups ]
where
whitelist = [ "x86_64-linux-alpine3_12-int_native-validate+fully_static"
, "x86_64-linux-deb10-validate"
@@ -942,8 +941,6 @@ platform_mapping = Map.map go $
combine a b
| name (v a) `elem` whitelist = a -- Explicitly selected
| name (v b) `elem` whitelist = b
- | hasReleaseBuild a, not (hasReleaseBuild b) = a -- Has release build, but other doesn't
- | hasReleaseBuild b, not (hasReleaseBuild a) = b
| otherwise = error (show (name (v a)) ++ show (name (v b)))
go = fmap (BindistInfo . unwords . fromJust . mmlookup "BIN_DIST_NAME" . jobVariables)