Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1235,7 +1235,7 @@ darwin =
    1235 1235
     
    
    1236 1236
     freebsd_jobs :: [JobGroup Job]
    
    1237 1237
     freebsd_jobs =
    
    1238
    -  [ addValidateRule FreeBSDLabel (standardBuilds Amd64 FreeBSD14)
    
    1238
    +  [ addValidateRule FreeBSDLabel (standardBuildsWithConfig Amd64 FreeBSD14 (splitSectionsBroken vanilla))
    
    1239 1239
       ]
    
    1240 1240
     
    
    1241 1241
     alpine_x86 :: [JobGroup Job]
    

  • .gitlab/jobs.yaml
    ... ... @@ -4296,7 +4296,7 @@
    4296 4296
           "ac_cv_func_utimensat": "no"
    
    4297 4297
         }
    
    4298 4298
       },
    
    4299
    -  "release-x86_64-freebsd14-release": {
    
    4299
    +  "release-x86_64-freebsd14-release+no_split_sections": {
    
    4300 4300
         "after_script": [
    
    4301 4301
           ".gitlab/ci.sh save_cache",
    
    4302 4302
           ".gitlab/ci.sh save_test_output",
    
    ... ... @@ -4307,7 +4307,7 @@
    4307 4307
         "artifacts": {
    
    4308 4308
           "expire_in": "1 year",
    
    4309 4309
           "paths": [
    
    4310
    -        "ghc-x86_64-freebsd14-release.tar.xz",
    
    4310
    +        "ghc-x86_64-freebsd14-release+no_split_sections.tar.xz",
    
    4311 4311
             "junit.xml",
    
    4312 4312
             "unexpected-test-output.tar.gz"
    
    4313 4313
           ],
    
    ... ... @@ -4349,8 +4349,8 @@
    4349 4349
         ],
    
    4350 4350
         "variables": {
    
    4351 4351
           "BIGNUM_BACKEND": "gmp",
    
    4352
    -      "BIN_DIST_NAME": "ghc-x86_64-freebsd14-release",
    
    4353
    -      "BUILD_FLAVOUR": "release",
    
    4352
    +      "BIN_DIST_NAME": "ghc-x86_64-freebsd14-release+no_split_sections",
    
    4353
    +      "BUILD_FLAVOUR": "release+no_split_sections",
    
    4354 4354
           "CABAL_INSTALL_VERSION": "3.10.3.0",
    
    4355 4355
           "CC": "cc",
    
    4356 4356
           "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check",
    
    ... ... @@ -4359,7 +4359,7 @@
    4359 4359
           "IGNORE_PERF_FAILURES": "all",
    
    4360 4360
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4361 4361
           "RUNTEST_ARGS": "",
    
    4362
    -      "TEST_ENV": "x86_64-freebsd14-release",
    
    4362
    +      "TEST_ENV": "x86_64-freebsd14-release+no_split_sections",
    
    4363 4363
           "XZ_OPT": "-9"
    
    4364 4364
         }
    
    4365 4365
       },