Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC
Commits:
-
a3b7c581
by mangoiv at 2026-08-07T16:19:50+02:00
2 changed files:
Changes:
| ... | ... | @@ -1032,24 +1032,24 @@ releaseRule = setJobRule ReleaseOnly |
| 1032 | 1032 | -- | Make a normal nightly CI job
|
| 1033 | 1033 | nightly :: Arch -> Opsys -> BuildConfig -> BuildAndTestJob Job
|
| 1034 | 1034 | nightly arch opsys bc =
|
| 1035 | - let MkBuildAndTestJob {buildJob, testJobs} = job arch opsys bc
|
|
| 1036 | - mkJob (NamedJob n j)
|
|
| 1037 | - = NamedJob { name = "nightly-" ++ n
|
|
| 1035 | + let MkBuildAndTestJob {buildJob, testJobs} = job arch opsys bc { extendName = Just "nightly" }
|
|
| 1036 | + mkJob NamedJob {name, jobInfo}
|
|
| 1037 | + = NamedJob { name
|
|
| 1038 | 1038 | , jobInfo = nightlyRule
|
| 1039 | 1039 | . keepArtifacts "8 weeks"
|
| 1040 | - . highCompression $ j
|
|
| 1040 | + . highCompression $ jobInfo
|
|
| 1041 | 1041 | }
|
| 1042 | 1042 | in MkBuildAndTestJob { buildJob = mkJob buildJob, testJobs = map mkJob testJobs}
|
| 1043 | 1043 | |
| 1044 | 1044 | -- | Make a normal release CI job
|
| 1045 | 1045 | release :: Arch -> Opsys -> BuildConfig -> BuildAndTestJob Job
|
| 1046 | 1046 | release arch opsys bc =
|
| 1047 | - let MkBuildAndTestJob {buildJob, testJobs} = job arch opsys (bc { buildFlavour = Release })
|
|
| 1048 | - mkJob (NamedJob n j) = NamedJob { name = "release-" ++ n
|
|
| 1047 | + let MkBuildAndTestJob {buildJob, testJobs} = job arch opsys (bc { buildFlavour = Release, extendName = Just "release" })
|
|
| 1048 | + mkJob NamedJob {name, jobInfo} = NamedJob { name
|
|
| 1049 | 1049 | , jobInfo = releaseRule
|
| 1050 | 1050 | . keepArtifacts "1 year"
|
| 1051 | 1051 | . ignorePerfFailures
|
| 1052 | - . highCompression $ j
|
|
| 1052 | + . highCompression $ jobInfo
|
|
| 1053 | 1053 | }
|
| 1054 | 1054 | in MkBuildAndTestJob {buildJob = mkJob buildJob, testJobs = map mkJob testJobs}
|
| 1055 | 1055 | ---------------------------------------------------------------------
|