File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change 3838      - ARCH : x86_64 
3939        TAG : x86_64-linux 
4040        OS :
41-           - centos7 
4241          - deb9 
4342          - deb10 
4443          - deb11 
@@ -50,6 +49,14 @@ linux:
5049          - ubuntu18_04 
5150          - ubuntu20_04 
5251          - ubuntu22_04 
52+       #  Pull this one from the future, since it's missing.
53+       #  We can't move the entire file to this DOCKER_REV, because
54+       #  i386-linux-deb9 is missing from it.
55+       - ARCH : x86_64 
56+         TAG : x86_64-linux 
57+         OS : centos7 
58+         DOCKER_REV : f2d12519f45a13a61fcca03a949f927ceead6492 
59+ 
5360      - ARCH : aarch64 
5461        TAG : aarch64-linux 
5562        OS :
Original file line number Diff line number Diff line change @@ -4,7 +4,14 @@ set -Eeuo pipefail
44
55source  " $CI_PROJECT_DIR /.gitlab/common.sh" 
66
7- if  [[ " $( uname) "   ==  " Linux"   ]];  then 
7+ # # Figure out how to get the Haskell toolchain.
8+ 
9+ #  For backport, the centos image no longer has the right GHC version, so use
10+ #  ghcup.
11+ if  [[ -f  /etc/os-release &&  " $( grep ^ID /etc/os-release) "   =~  " centos"   ]];  then 
12+     .  " $CI_PROJECT_DIR /.gitlab/ghcup.sh" 
13+ #  All the other ones are fine.
14+ elif  [[ " $( uname) "   ==  " Linux"   ]];  then 
815    export  PATH=" /opt/ghc/${GHC_VERSION} /bin:${PATH} " 
916#  Not all runners use ci-images, so ghcup is used.
1017else 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments