From 2d7511e041da351594393badacc43d3d98651418 Mon Sep 17 00:00:00 2001
From: Bryan Richter <bryan@haskell.foundation>
Date: Wed, 22 Nov 2023 16:47:58 +0200
Subject: [PATCH] Use term "package"
"unit" is sort of a GHC-specific term. Head.hackage is definitely
building Cabal packages so we can avoid some confusion by just calling
them "packages". This is probably easier for users to understand.
Some discussion about this came during Zurihac 2023. For instance,
https://youtu.be/XfTinQPjDQw?t=2774 where SPJ suggests a more distinct
split between "units" and "packages". It also came up while discussing
head.hackage itself, but I don't remember where or if it was recorded.
---
ci/README.md | 2 +-
ci/TestPatches.hs | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ci/README.md b/ci/README.md
index 19eef6cc..e6cfc29f 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -77,7 +77,7 @@ The below is all orchestrated by `run-ci.sh`:
the outcome of the build
1. Write a JSON report (of type `Types.RunResult ()`) to `result.json`
- 1. Examine the failed units and determine whether there were any unexpected failures.
+ 1. Examine the failed packages and determine whether there were any unexpected failures.
### Build plans and empty patches
diff --git a/ci/TestPatches.hs b/ci/TestPatches.hs
index c5a3dd5f..317d7000 100644
--- a/ci/TestPatches.hs
+++ b/ci/TestPatches.hs
@@ -245,25 +245,25 @@ resultSummary broken runResult = (ok, msg)
&& null failedTestsBuild
&& null failedUnits
msg = vcat
- [ "Total units built:" <+> pshow (length allUnits)
+ [ "Total packages built:" <+> pshow (length allUnits)
, ""
, pshow (length planningErrs) <+> "had no valid install plan:"
, PP.indent 4 $ vcat $ map (uncurry prettyPkgVer) planningErrs
, ""
- , pshow (length failedUnits) <+> "units failed to build:"
+ , pshow (length failedUnits) <+> "packages failed to build:"
, PP.indent 4 $ vcat
[ prettyPkgVer (pkgName binfo) (version binfo)
| (binfo, _) <- M.elems failedUnits ]
- , pshow (length expectedFailedUnits) <+> "units failed to build (expected):"
+ , pshow (length expectedFailedUnits) <+> "packages failed to build (expected):"
, PP.indent 4 $ vcat
[ prettyPkgVer (pkgName binfo) (version binfo)
| (binfo, _) <- M.elems expectedFailedUnits ]
- , pshow (length failedTargetUnits) <+> "target units failed to build:"
+ , pshow (length failedTargetUnits) <+> "target packages failed to build:"
, PP.indent 4 $ vcat
[ prettyPkgVer pkg ver
| (pkg, ver) <- failedTargetUnits ]
, ""
- , pshow (length failedDependsUnits) <+> "units failed to build due to unbuildable dependencies."
+ , pshow (length failedDependsUnits) <+> "packages failed to build due to unbuildable dependencies."
, ""
, pshow (length failedTestsBuild) <+> "testsuites failed build."
, PP.indent 4 $ vcat
--
GitLab