Wolfgang Jeltsch pushed to branch wip/jeltsch/ghc-9-14-building-base at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -1177,7 +1177,7 @@ base-with-other-ghcs-linux:
    1177 1177
       image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV"
    
    1178 1178
       tags:
    
    1179 1179
         - x86_64-linux
    
    1180
    -  script: .gitlab/base-ci.sh x86_64-deb12-linux 9.14.2
    
    1180
    +  script: .gitlab/base-ci.sh x86_64-deb12-linux 9.14.1
    
    1181 1181
       rules:
    
    1182 1182
         - *full-ci
    
    1183 1183
     
    
    ... ... @@ -1194,7 +1194,7 @@ base-with-other-ghcs-windows:
    1194 1194
       image: null
    
    1195 1195
       tags:
    
    1196 1196
         - x86_64-windows
    
    1197
    -  script: bash .gitlab/base-ci.sh x86_64-unknown-mingw32 9.14.2
    
    1197
    +  script: bash .gitlab/base-ci.sh x86_64-unknown-mingw32 9.14.1
    
    1198 1198
       rules:
    
    1199 1199
         - *full-ci
    
    1200 1200
     
    

  • .gitlab/base-ci.sh
    ... ... @@ -8,8 +8,11 @@
    8 8
     # Currently, this script can only test that the in-tree `base` can be *built*
    
    9 9
     # with certain *released* GHCs.
    
    10 10
     
    
    11
    +# Establish error propagation
    
    12
    +set -e -o pipefail
    
    13
    +
    
    11 14
     # Process arguments
    
    12
    -if [ $# -ne 2 ]
    
    15
    +if [ $# -lt 1 ]
    
    13 16
     then
    
    14 17
       echo 'Build `base` with released GHCs'
    
    15 18
       echo "Usage: base-ci ⟨platform⟩ ⟨ghc-version⟩ …"