[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 4 commits: Actually set hackage index state

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
69e2b2cf by Bryan Richter at 2023-10-06T02:46:36-04:00
Actually set hackage index state

Or at least, use a version of the cabal command that *claims* to set the
index state.

Time will tell.

- - - - -
9c9cd509 by Bryan Richter at 2023-10-06T02:46:36-04:00
Update hackage index state

- - - - -
8a9dfa34 by Bryan Richter at 2023-10-06T02:46:36-04:00
Ensure hadrian uses CI's hackage index state

- - - - -
c8f77472 by David Binder at 2023-10-06T02:46:39-04:00
Update hpc-bin submodule to 0.69

- - - - -


4 changed files:

- .gitlab/ci.sh
- hadrian/cabal.project
- testsuite/tests/hpc/T17073.stdout
- utils/hpc


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -7,7 +7,7 @@
 set -Eeuo pipefail
 
 # Configuration:
-HACKAGE_INDEX_STATE="2020-12-21T14:48:20Z"
+HACKAGE_INDEX_STATE="2023-10-05T11:38:51Z"
 MIN_HAPPY_VERSION="1.20"
 MIN_ALEX_VERSION="3.2.6"
 
@@ -230,7 +230,7 @@ function set_toolchain_paths() {
 function cabal_update() {
   # In principle -w shouldn't be necessary here but with
   # cabal-install 3.8.1.0 it is, due to cabal#8447.
-  run "$CABAL" update -w "$GHC" --index="$HACKAGE_INDEX_STATE"
+  run "$CABAL" update -w "$GHC" "hackage.haskell.org,${HACKAGE_INDEX_STATE}"
 }
 
 
@@ -480,6 +480,9 @@ function build_hadrian() {
 
   check_release_build
 
+  # Just to be sure, use the same hackage index state when building Hadrian.
+  echo "index-state: $HACKAGE_INDEX_STATE" > hadrian/cabal.project.local
+
   # We can safely enable parallel compression for x64. By the time
   # hadrian calls tar/xz to produce bindist, there's no other build
   # work taking place.


=====================================
hadrian/cabal.project
=====================================
@@ -3,7 +3,8 @@ packages: ./
           ../libraries/ghc-platform/
 
 -- This essentially freezes the build plan for hadrian
-index-state: 2023-09-18T18:43:12Z
+-- It would be wise to keep this up to date with the state set in ci.sh
+index-state: 2023-10-05T11:38:51Z
 
 -- N.B. Compile with -O0 since this is not a performance-critical executable
 -- and the Cabal takes nearly twice as long to build with -O1. See #16817.


=====================================
testsuite/tests/hpc/T17073.stdout
=====================================
@@ -7,7 +7,7 @@
 100% alternatives used (0/0)
 100% local declarations used (0/0)
 100% top-level declarations used (1/1)
-hpc tools, version 0.68
+hpc tools, version 0.69
 Writing: Main.hs.html
 Writing: hpc_index.html
 Writing: hpc_index_fun.html


=====================================
utils/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 2d75eb33d4c179b1c21000d32c2906ad273de0de
+Subproject commit 4b46380a06c16e38a5b9d623ab85538ee4b2319d



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/742d819d67371ba2cbb6c49a0cf29ffdec69e2cd...c8f7747250bf10e0bf6737704b799e9bfd7e4883

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/742d819d67371ba2cbb6c49a0cf29ffdec69e2cd...c8f7747250bf10e0bf6737704b799e9bfd7e4883
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231006/9a5084f9/attachment-0001.html>