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

Commits:

3 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -1173,17 +1173,17 @@ debian_x86 =
    1173 1173
    1174 1174 
     debian_aarch64 :: [JobGroup Job]
    1175 1175 
     debian_aarch64 =
    1176 
    -  [
    1177 
    -     disableValidate (standardBuildsWithConfig AArch64 (Linux Debian11) (splitSectionsBroken vanilla))
    1178 
    -   , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian12) (splitSectionsBroken vanilla))
    1179 
    -   , fastCI (standardBuildsWithConfig AArch64 (Linux Debian13) (splitSectionsBroken vanilla))
    1180 
    -     -- LLVM backend bootstrap
    1181 
    -   , onlyRule LLVMBackend (validateBuilds AArch64 (Linux Debian13) llvm)
    1176 
    +  [ disableValidate (standardBuildsWithConfig AArch64 (Linux Debian11) (splitSectionsBroken vanilla))
    1177 
    +  , disableValidate (standardBuildsWithConfig AArch64 (Linux Debian12) (splitSectionsBroken vanilla))
    1178 
    +  , fastCI (standardBuildsWithConfig AArch64 (Linux Debian13) (splitSectionsBroken vanilla))
    1179 
    +    -- LLVM backend bootstrap
    1180 
    +  , onlyRule LLVMBackend (validateBuilds AArch64 (Linux Debian13) llvm)
    1182 1181 
       ]
    1183 1182
    1184 1183 
     debian_i386 :: [JobGroup Job]
    1185 1184 
     debian_i386 =
    1186 1185 
       [ disableValidate (standardBuildsWithConfig I386 (Linux Debian11) (splitSectionsBroken vanilla))
    1186 
    +  , disableValidate (standardBuildsWithConfig I386 (Linux Debian12) (splitSectionsBroken vanilla))
    1187 1187 
       , addValidateRule I386Backend (standardBuildsWithConfig I386 (Linux Debian13) (splitSectionsBroken vanilla))
    1188 1188 
       ]
    1189 1189

  • .gitlab/jobs.yaml
    ... ... @@ -664,6 +664,68 @@
    664 664 
           "TEST_ENV": "i386-linux-deb11-validate"
    665 665 
         }
    666 666 
       },
    667 
    +  "i386-linux-deb12-validate": {
    668 
    +    "after_script": [
    669 
    +      ".gitlab/ci.sh save_cache",
    670 
    +      ".gitlab/ci.sh save_test_output",
    671 
    +      ".gitlab/ci.sh clean",
    672 
    +      "cat ci_timings.txt"
    673 
    +    ],
    674 
    +    "allow_failure": false,
    675 
    +    "artifacts": {
    676 
    +      "expire_in": "2 weeks",
    677 
    +      "paths": [
    678 
    +        "ghc-i386-linux-deb12-validate.tar.xz",
    679 
    +        "junit.xml",
    680 
    +        "unexpected-test-output.tar.gz"
    681 
    +      ],
    682 
    +      "reports": {
    683 
    +        "junit": "junit.xml"
    684 
    +      },
    685 
    +      "when": "always"
    686 
    +    },
    687 
    +    "cache": {
    688 
    +      "key": "i386-linux-deb12-$CACHE_REV",
    689 
    +      "paths": [
    690 
    +        "cabal-cache",
    691 
    +        "toolchain"
    692 
    +      ]
    693 
    +    },
    694 
    +    "dependencies": [],
    695 
    +    "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$DOCKER_REV",
    696 
    +    "needs": [
    697 
    +      {
    698 
    +        "artifacts": false,
    699 
    +        "job": "hadrian-ghc-in-ghci"
    700 
    +      }
    701 
    +    ],
    702 
    +    "rules": [
    703 
    +      {
    704 
    +        "if": "((($ONLY_JOBS) && ($ONLY_JOBS =~ /.*\\bi386-linux-deb12-validate(\\s|$).*/)) || (($ONLY_JOBS == null) && (\"disabled\" != \"disabled\"))) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null)",
    705 
    +        "when": "on_success"
    706 
    +      }
    707 
    +    ],
    708 
    +    "script": [
    709 
    +      "sudo chown ghc:ghc -R .",
    710 
    +      ".gitlab/ci.sh setup",
    711 
    +      ".gitlab/ci.sh configure",
    712 
    +      ".gitlab/ci.sh build_hadrian",
    713 
    +      ".gitlab/ci.sh test_hadrian"
    714 
    +    ],
    715 
    +    "stage": "full-build",
    716 
    +    "tags": [
    717 
    +      "x86_64-linux"
    718 
    +    ],
    719 
    +    "variables": {
    720 
    +      "BIGNUM_BACKEND": "gmp",
    721 
    +      "BIN_DIST_NAME": "ghc-i386-linux-deb12-validate",
    722 
    +      "BUILD_FLAVOUR": "validate",
    723 
    +      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    724 
    +      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    725 
    +      "RUNTEST_ARGS": "",
    726 
    +      "TEST_ENV": "i386-linux-deb12-validate"
    727 
    +    }
    728 
    +  },
    667 729 
       "i386-linux-deb13-validate": {
    668 730 
         "after_script": [
    669 731 
           ".gitlab/ci.sh save_cache",
    ... ... @@ -1400,6 +1462,69 @@
    1400 1462 
           "XZ_OPT": "-9"
    1401 1463 
         }
    1402 1464 
       },
    1465 
    +  "nightly-i386-linux-deb12-validate": {
    1466 
    +    "after_script": [
    1467 
    +      ".gitlab/ci.sh save_cache",
    1468 
    +      ".gitlab/ci.sh save_test_output",
    1469 
    +      ".gitlab/ci.sh clean",
    1470 
    +      "cat ci_timings.txt"
    1471 
    +    ],
    1472 
    +    "allow_failure": false,
    1473 
    +    "artifacts": {
    1474 
    +      "expire_in": "8 weeks",
    1475 
    +      "paths": [
    1476 
    +        "ghc-i386-linux-deb12-validate.tar.xz",
    1477 
    +        "junit.xml",
    1478 
    +        "unexpected-test-output.tar.gz"
    1479 
    +      ],
    1480 
    +      "reports": {
    1481 
    +        "junit": "junit.xml"
    1482 
    +      },
    1483 
    +      "when": "always"
    1484 
    +    },
    1485 
    +    "cache": {
    1486 
    +      "key": "i386-linux-deb12-$CACHE_REV",
    1487 
    +      "paths": [
    1488 
    +        "cabal-cache",
    1489 
    +        "toolchain"
    1490 
    +      ]
    1491 
    +    },
    1492 
    +    "dependencies": [],
    1493 
    +    "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$DOCKER_REV",
    1494 
    +    "needs": [
    1495 
    +      {
    1496 
    +        "artifacts": false,
    1497 
    +        "job": "hadrian-ghc-in-ghci"
    1498 
    +      }
    1499 
    +    ],
    1500 
    +    "rules": [
    1501 
    +      {
    1502 
    +        "if": "(\"true\" == \"true\") && ($RELEASE_JOB != \"yes\") && ($NIGHTLY)",
    1503 
    +        "when": "on_success"
    1504 
    +      }
    1505 
    +    ],
    1506 
    +    "script": [
    1507 
    +      "sudo chown ghc:ghc -R .",
    1508 
    +      ".gitlab/ci.sh setup",
    1509 
    +      ".gitlab/ci.sh configure",
    1510 
    +      ".gitlab/ci.sh build_hadrian",
    1511 
    +      ".gitlab/ci.sh test_hadrian"
    1512 
    +    ],
    1513 
    +    "stage": "full-build",
    1514 
    +    "tags": [
    1515 
    +      "x86_64-linux"
    1516 
    +    ],
    1517 
    +    "variables": {
    1518 
    +      "BIGNUM_BACKEND": "gmp",
    1519 
    +      "BIN_DIST_NAME": "ghc-i386-linux-deb12-validate",
    1520 
    +      "BUILD_FLAVOUR": "validate",
    1521 
    +      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    1522 
    +      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    1523 
    +      "RUNTEST_ARGS": "",
    1524 
    +      "TEST_ENV": "i386-linux-deb12-validate",
    1525 
    +      "XZ_OPT": "-9"
    1526 
    +    }
    1527 
    +  },
    1403 1528 
       "nightly-i386-linux-deb13-validate": {
    1404 1529 
         "after_script": [
    1405 1530 
           ".gitlab/ci.sh save_cache",
    ... ... @@ -4156,6 +4281,70 @@
    4156 4281 
           "XZ_OPT": "-9"
    4157 4282 
         }
    4158 4283 
       },
    4284 
    +  "release-i386-linux-deb12-release+no_split_sections": {
    4285 
    +    "after_script": [
    4286 
    +      ".gitlab/ci.sh save_cache",
    4287 
    +      ".gitlab/ci.sh save_test_output",
    4288 
    +      ".gitlab/ci.sh clean",
    4289 
    +      "cat ci_timings.txt"
    4290 
    +    ],
    4291 
    +    "allow_failure": false,
    4292 
    +    "artifacts": {
    4293 
    +      "expire_in": "1 year",
    4294 
    +      "paths": [
    4295 
    +        "ghc-i386-linux-deb12-release+no_split_sections.tar.xz",
    4296 
    +        "junit.xml",
    4297 
    +        "unexpected-test-output.tar.gz"
    4298 
    +      ],
    4299 
    +      "reports": {
    4300 
    +        "junit": "junit.xml"
    4301 
    +      },
    4302 
    +      "when": "always"
    4303 
    +    },
    4304 
    +    "cache": {
    4305 
    +      "key": "i386-linux-deb12-$CACHE_REV",
    4306 
    +      "paths": [
    4307 
    +        "cabal-cache",
    4308 
    +        "toolchain"
    4309 
    +      ]
    4310 
    +    },
    4311 
    +    "dependencies": [],
    4312 
    +    "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb12:$DOCKER_REV",
    4313 
    +    "needs": [
    4314 
    +      {
    4315 
    +        "artifacts": false,
    4316 
    +        "job": "hadrian-ghc-in-ghci"
    4317 
    +      }
    4318 
    +    ],
    4319 
    +    "rules": [
    4320 
    +      {
    4321 
    +        "if": "(\"true\" == \"true\") && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null)",
    4322 
    +        "when": "on_success"
    4323 
    +      }
    4324 
    +    ],
    4325 
    +    "script": [
    4326 
    +      "sudo chown ghc:ghc -R .",
    4327 
    +      ".gitlab/ci.sh setup",
    4328 
    +      ".gitlab/ci.sh configure",
    4329 
    +      ".gitlab/ci.sh build_hadrian",
    4330 
    +      ".gitlab/ci.sh test_hadrian"
    4331 
    +    ],
    4332 
    +    "stage": "full-build",
    4333 
    +    "tags": [
    4334 
    +      "x86_64-linux"
    4335 
    +    ],
    4336 
    +    "variables": {
    4337 
    +      "BIGNUM_BACKEND": "gmp",
    4338 
    +      "BIN_DIST_NAME": "ghc-i386-linux-deb12-release+no_split_sections",
    4339 
    +      "BUILD_FLAVOUR": "release+no_split_sections",
    4340 
    +      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    4341 
    +      "IGNORE_PERF_FAILURES": "all",
    4342 
    +      "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    4343 
    +      "RUNTEST_ARGS": "",
    4344 
    +      "TEST_ENV": "i386-linux-deb12-release+no_split_sections",
    4345 
    +      "XZ_OPT": "-9"
    4346 
    +    }
    4347 
    +  },
    4159 4348 
       "release-i386-linux-deb13-release+no_split_sections": {
    4160 4349 
         "after_script": [
    4161 4350 
           ".gitlab/ci.sh save_cache",

  • .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
    ... ... @@ -244,7 +244,8 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map):
    244 244 
               }
    245 245
    246 246 
         a32 = { "Linux_Debian": { "( >= 11 && < 12 )": deb11_i386
    247 
    -                            , ">= 12": deb12_i386
    247 
    +                            , "( >= 12 && < 13 )": deb12_i386
    248 
    +                            , ">= 13": deb13_i386
    248 249 
                                 , "unknown_versioning": deb11_i386 }
    249 250 
               , "Linux_Ubuntu": { "unknown_versioning": deb11_i386 }
    250 251 
               , "Linux_Mint" : { "unknown_versioning": deb11_i386 }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help