[Git][ghc/ghc][wip/ghc-9.8] 3 commits: gitlab-ci: Bump DOCKER_REV

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/ghc-9.8 at Glasgow Haskell Compiler / GHC


Commits:
badff2d0 by Ben Gamari at 2023-07-09T13:40:32-04:00
gitlab-ci: Bump DOCKER_REV

Ensuring that we bootstrap with GHC 9.4 universally.

- - - - -
008664da by Ben Gamari at 2023-07-09T16:14:01-04:00
testsuite: Normalise versions more aggressively

In backpack hashes can contain `+` characters.

- - - - -
507de982 by Ben Gamari at 2023-07-09T16:15:14-04:00
testsuite: Accept new output of bkpcabal08

It seems that Cabal now configures in a different order.

- - - - -


3 changed files:

- .gitlab-ci.yml
- testsuite/driver/testlib.py
- testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 243a00f06550e6b9a00fa0f1530d1bb761e8b7cc
+  DOCKER_REV: c29d97c469a23db1c77ac1184eebbb2fd86ef623
 
   # Sequential version number of all cached things.
   # Bump to invalidate GitLab CI cache.


=====================================
testsuite/driver/testlib.py
=====================================
@@ -1006,7 +1006,7 @@ def normalise_win32_io_errors(name, opts):
 def normalise_version_( *pkgs ):
     def normalise_version__( str ):
         # (name)(-version)(-hash)(-components)
-        return re.sub('(' + '|'.join(map(re.escape,pkgs)) + ')-[0-9.]+(-[0-9a-zA-Z]+)?(-[0-9a-zA-Z]+)?',
+        return re.sub('(' + '|'.join(map(re.escape,pkgs)) + ')-[0-9.]+(-[0-9a-zA-Z\+]+)?(-[0-9a-zA-Z]+)?',
                       '\\1-<VERSION>-<HASH>', str)
     return normalise_version__
 


=====================================
testsuite/tests/backpack/cabal/bkpcabal08/bkpcabal08.stdout
=====================================
@@ -1,5 +1,3 @@
-Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
-Building library 'impl' for bkpcabal08-0.1.0.0...
 Preprocessing library 'p' for bkpcabal08-0.1.0.0...
 Building library 'p' instantiated with
   A = <A>
@@ -14,6 +12,8 @@ for bkpcabal08-0.1.0.0...
 [2 of 4] Compiling B[sig]           ( q/B.hsig, nothing )
 [3 of 4] Compiling M                ( q/M.hs, nothing ) [A changed]
 [4 of 4] Instantiating bkpcabal08-0.1.0.0-5O1mUtZZLBeDZEqqtwJcCj-p
+Preprocessing library 'impl' for bkpcabal08-0.1.0.0...
+Building library 'impl' for bkpcabal08-0.1.0.0...
 Preprocessing library 'q' for bkpcabal08-0.1.0.0...
 Building library 'q' instantiated with
   A = bkpcabal08-0.1.0.0-DlVb5PcmUolGCHYbfTL7EP-impl:A



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/02b96edd178865610b933f6441cd6985be039eea...507de98253f018d0363c2ff2ff8f65009be26ac9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/02b96edd178865610b933f6441cd6985be039eea...507de98253f018d0363c2ff2ff8f65009be26ac9
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/20230709/cc2ce2bd/attachment-0001.html>