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
    ... ... @@ -1163,10 +1163,10 @@ base-with-other-ghcs-linux:
    1163 1163
         - job: release-x86_64-linux-deb13-release
    
    1164 1164
           optional: true
    
    1165 1165
       dependencies: null
    
    1166
    -  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV"
    
    1166
    +  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb13:$DOCKER_REV"
    
    1167 1167
       tags:
    
    1168 1168
         - x86_64-linux
    
    1169
    -  script: .gitlab/base-ci.sh x86_64-deb12-linux 9.14.1
    
    1169
    +  script: .gitlab/base-ci.sh x86_64-deb13-linux 9.14.1
    
    1170 1170
       rules:
    
    1171 1171
         - *full-ci
    
    1172 1172
     
    

  • .gitlab/base-ci.sh
    ... ... @@ -43,7 +43,7 @@ cat <<. >Setup.hs
    43 43
     import Distribution.Simple
    
    44 44
     main = defaultMain
    
    45 45
     .
    
    46
    -cd ${project_root}
    
    46
    +cd "${project_root}"
    
    47 47
     
    
    48 48
     # Build `base` with the different GHCs
    
    49 49
     for ghc_version in ${ghc_versions}
    
    ... ... @@ -63,7 +63,7 @@ do
    63 63
       else # Windows
    
    64 64
         mv ghc-${ghc_version}-* "${ghc_installation}"
    
    65 65
       fi
    
    66
    -  cd ${project_root}
    
    66
    +  cd "${project_root}"
    
    67 67
     
    
    68 68
       # Build `base` with the installed GHC
    
    69 69
       cd libraries/base
    
    ... ... @@ -71,5 +71,5 @@ do
    71 71
         --with-compiler "${ghc_installation}/bin/ghc" \
    
    72 72
         --disable-optimization
    
    73 73
       "${ghc_installation}/bin/runghc" Setup.hs build
    
    74
    -  cd ${project_root}
    
    74
    +  cd "${project_root}"
    
    75 75
     done