Cheng Shao pushed to branch wip/testing-use-deb at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -444,14 +444,14 @@ hadrian-ghc-in-ghci:
    444 444
     hadrian-multi:
    
    445 445
       stage: testing
    
    446 446
       needs:
    
    447
    -    - job: x86_64-linux-fedora43-release
    
    447
    +    - job: x86_64-linux-deb12-validate
    
    448 448
           optional: true
    
    449
    -    - job: nightly-x86_64-linux-fedora43-release
    
    449
    +    - job: nightly-x86_64-linux-deb12-validate
    
    450 450
           optional: true
    
    451
    -    - job: release-x86_64-linux-fedora43-release
    
    451
    +    - job: release-x86_64-linux-deb12-release
    
    452 452
           optional: true
    
    453 453
       dependencies: null
    
    454
    -  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora43:$DOCKER_REV"
    
    454
    +  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV"
    
    455 455
       before_script:
    
    456 456
         # workaround for docker permissions
    
    457 457
         - sudo chown ghc:ghc -R .
    
    ... ... @@ -471,7 +471,8 @@ hadrian-multi:
    471 471
         - ls
    
    472 472
         - |
    
    473 473
           mkdir tmp
    
    474
    -      tar -xf ghc-x86_64-linux-fedora43-release.tar.xz -C tmp
    
    474
    +      tar -xf ghc-x86_64-linux-deb12-validate.tar.xz -C tmp \
    
    475
    +        || tar -xf ghc-x86_64-linux-deb12-release.tar.xz -C tmp
    
    475 476
           pushd tmp/ghc-*/
    
    476 477
           ./configure --prefix=$root
    
    477 478
           make install
    
    ... ... @@ -1001,14 +1002,14 @@ perf-nofib:
    1001 1002
     perf:
    
    1002 1003
       stage: testing
    
    1003 1004
       needs:
    
    1004
    -    - job: x86_64-linux-fedora43-release
    
    1005
    +    - job: x86_64-linux-deb12-validate
    
    1005 1006
           optional: true
    
    1006
    -    - job: nightly-x86_64-linux-fedora43-release
    
    1007
    +    - job: nightly-x86_64-linux-deb12-validate
    
    1007 1008
           optional: true
    
    1008
    -    - job: release-x86_64-linux-fedora43-release
    
    1009
    +    - job: release-x86_64-linux-deb12-release
    
    1009 1010
           optional: true
    
    1010 1011
       dependencies: null
    
    1011
    -  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora43:$DOCKER_REV"
    
    1012
    +  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV"
    
    1012 1013
       tags:
    
    1013 1014
         - x86_64-linux-perf
    
    1014 1015
       before_script:
    
    ... ... @@ -1018,7 +1019,8 @@ perf:
    1018 1019
         - root=$(pwd)/ghc
    
    1019 1020
         - |
    
    1020 1021
           mkdir tmp
    
    1021
    -      tar -xf ghc-x86_64-linux-fedora43-release.tar.xz -C tmp
    
    1022
    +      tar -xf ghc-x86_64-linux-deb12-validate.tar.xz -C tmp \
    
    1023
    +        || tar -xf ghc-x86_64-linux-deb12-release.tar.xz -C tmp
    
    1022 1024
           pushd tmp/ghc-*/
    
    1023 1025
           ./configure --prefix=$root
    
    1024 1026
           make install
    
    ... ... @@ -1042,21 +1044,22 @@ perf:
    1042 1044
     abi-test:
    
    1043 1045
       stage: testing
    
    1044 1046
       needs:
    
    1045
    -    - job: x86_64-linux-fedora43-release
    
    1047
    +    - job: x86_64-linux-deb12-validate
    
    1046 1048
           optional: true
    
    1047
    -    - job: nightly-x86_64-linux-fedora43-release
    
    1049
    +    - job: nightly-x86_64-linux-deb12-validate
    
    1048 1050
           optional: true
    
    1049
    -    - job: release-x86_64-linux-fedora43-release
    
    1051
    +    - job: release-x86_64-linux-deb12-release
    
    1050 1052
           optional: true
    
    1051 1053
       dependencies: null
    
    1052
    -  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora43:$DOCKER_REV"
    
    1054
    +  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb12:$DOCKER_REV"
    
    1053 1055
       tags:
    
    1054 1056
         - x86_64-linux
    
    1055 1057
       script:
    
    1056 1058
         - root=$(pwd)/ghc
    
    1057 1059
         - |
    
    1058 1060
           mkdir tmp
    
    1059
    -      tar -xf ghc-x86_64-linux-fedora43-release.tar.xz -C tmp
    
    1061
    +      tar -xf ghc-x86_64-linux-deb12-validate.tar.xz -C tmp \
    
    1062
    +        || tar -xf ghc-x86_64-linux-deb12-release.tar.xz -C tmp
    
    1060 1063
           pushd tmp/ghc-*/
    
    1061 1064
           ./configure --prefix=$root
    
    1062 1065
           make install