ci: Generate jobs for all normal builds and use hadrian for all builds

This commit introduces a new script (.gitlab/gen_ci.hs) which generates
a yaml file (.gitlab/jobs.yaml) which contains explicit descriptions for
all the jobs we want to run. The jobs are separated into three
categories:

* validate - jobs run on every MR
* nightly  - jobs run once per day on the master branch
* release  - jobs for producing release artifacts

The generation script is a Haskell program which includes a DSL for
specifying the different jobs. The hope is that it's easier to reason
about the different jobs and how the variables are merged together
rather than the unclear and opaque yaml syntax. The goal is to fix
issues like #21190 once and for all..

The `.gitlab/jobs.yaml` can be generated by running the `.gitlab/generate_jobs`
script. You have to do this manually.

Another consequence of this patch is that we use hadrian for all the
validate, nightly and release builds on all platforms.

1 files changed, 87 insertions, 877 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d10b50540..c0f1cc0739 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 
   # Sequential version number of all cached things.
   # Bump to invalidate GitLab CI cache.
-  CACHE_REV: 5
+  CACHE_REV: 6
 
   # Disable shallow clones; they break our linting rules
   GIT_DEPTH: 0
@@ -167,7 +167,12 @@ not-interruptible:
       when: always
 
 
+############################################################
+# Validate jobs
+############################################################
 
+# These jobs are generated by running the ./.gitlab/generate_jobs script
+include: '.gitlab/jobs.yaml'
 
 ############################################################
 # tool linting
@@ -265,9 +270,6 @@ lint-submods-branch:
     - export PATH="/opt/toolchain/bin:$PATH"
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
-    - git checkout .gitmodules
     - .gitlab/ci.sh setup
   after_script:
     - .gitlab/ci.sh save_cache
@@ -291,210 +293,6 @@ hlint-ghc-and-base:
     - .gitlab/ci.sh run_hadrian lint:compiler
 
 ############################################################
-# Validation via Pipelines (hadrian)
-############################################################
-
-.validate-hadrian:
-  variables:
-    BUILD_FLAVOUR: "validate"
-  script:
-    - .gitlab/ci.sh setup
-    - .gitlab/ci.sh configure
-    - .gitlab/ci.sh build_hadrian
-    - .gitlab/ci.sh test_hadrian
-  cache:
-    key: hadrian-$CACHE_REV
-    paths:
-      - cabal-cache
-  dependencies: []
-  artifacts:
-    reports:
-      junit: junit.xml
-    expire_in: 2 week
-    paths:
-      - "$BIN_DIST_NAME.tar.xz"
-      - junit.xml
-
-#################################
-# x86_64-linux-deb10
-#################################
-
-.build-x86_64-linux-deb10-hadrian:
-  extends: .validate-hadrian
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  variables:
-    TEST_ENV: "x86_64-linux-deb10-hadrian"
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux"
-  before_script:
-    # workaround for docker permissions
-    - sudo chown ghc:ghc -R .
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
-    - git checkout .gitmodules
-    - "git fetch https://gitlab.haskell.org/ghc/ghc-performance-notes.git refs/notes/perf:refs/notes/perf || true"
-  after_script:
-    - .gitlab/ci.sh save_cache
-    - .gitlab/ci.sh clean
-    - cat ci-timings
-  tags:
-    - x86_64-linux
-
-
-.validate-x86_64-linux-deb10-hadrian:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-validate-x86_64-linux-deb10-unreg-hadrian:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    CONFIGURE_ARGS: --enable-unregisterised
-    TEST_ENV: "x86_64-linux-deb10-unreg-hadrian"
-
-validate-x86_64-linux-deb10-no_tntc-hadrian:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  when: manual
-  variables:
-    CONFIGURE_ARGS: --disable-tables-next-to-code
-    TEST_ENV: "x86_64-linux-deb10-no_tntc-hadrian"
-
-.build-x86_64-linux-deb10-hadrian-cross-aarch64:
-  extends: .build-x86_64-linux-deb10-hadrian
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  variables:
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux"
-    CONFIGURE_ARGS: --with-intree-gmp
-    CROSS_TARGET: "aarch64-linux-gnu"
-
-validate-x86_64-linux-deb10-hadrian-cross-aarch64:
-  extends: .build-x86_64-linux-deb10-hadrian-cross-aarch64
-  stage: full-build
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*cross-compilation.*/'
-
-nightly-x86_64-linux-deb10-hadrian-cross-aarch64:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10-hadrian-cross-aarch64
-  stage: full-build
-
-
-release-x86_64-linux-deb10:
-  <<: *release
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-
-nightly-x86_64-linux-deb10:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    TEST_TYPE: slowtest
-
-# N.B. Has DEBUG assertions enabled in stage2
-validate-x86_64-linux-deb10-debug:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    # Slow-validate builds stage1 and stage2 compilers with -DDEBUG
-    BUILD_FLAVOUR: slow-validate
-    # Override validate flavour default; see #16890.
-    BUILD_SPHINX_PDF: "YES"
-    TEST_TYPE: slowtest
-    TEST_ENV: "x86_64-linux-deb10-debug"
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux-debug"
-    HADDOCK_HYPERLINKED_SOURCES: "yes"
-    # Numa enabled for this build so at least one build tests the libnuma build.
-    # It could be any job but luckily for deb10-debug, I choose it.
-    ENABLE_NUMA: 1
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-validate-x86_64-linux-deb10-integer-simple:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    BUILD_FLAVOUR: validate
-    BIGNUM_BACKEND: native
-    TEST_ENV: "x86_64-linux-deb10-integer-simple"
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux-integer-simple.tar.xz"
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-nightly-x86_64-linux-deb10-integer-simple:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    BIGNUM_BACKEND: native
-    TEST_ENV: "x86_64-linux-deb10-integer-simple"
-    TEST_TYPE: slowtest
-
-.build-x86_64-linux-deb10-tsan:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    TEST_ENV: "x86_64-linux-deb10-tsan"
-    BUILD_FLAVOUR: "default+thread_sanitizer"
-    TSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/rts/.tsan-suppressions"
-    # Haddock is large enough to make TSAN choke without massive quantities of
-    # memory.
-    HADRIAN_ARGS: "--docs=none"
-
-nightly-x86_64-linux-deb10-tsan:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10-tsan
-
-validate-x86_64-linux-deb10-tsan:
-  extends: .build-x86_64-linux-deb10-tsan
-  when: manual
-
-validate-x86_64-linux-deb10-dwarf:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    CONFIGURE_ARGS: "--enable-dwarf-unwind"
-    BUILD_FLAVOUR: validate+debug_info
-    TEST_ENV: "x86_64-linux-deb10-dwarf-validate"
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux-dwarf"
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-release-x86_64-linux-deb10-dwarf:
-  <<: *release
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    CONFIGURE_ARGS: "--enable-dwarf-unwind"
-    BUILD_FLAVOUR: perf+debug_info
-    TEST_ENV: "x86_64-linux-deb10-dwarf-perf"
-    BIN_DIST_NAME: "ghc-x86_64-deb10-linux-dwarf"
-  artifacts:
-    when: always
-    expire_in: 1 year
-
-validate-x86_64-linux-deb10-llvm:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*LLVM backend.*/'
-  variables:
-    BUILD_FLAVOUR: validate+llvm
-    TEST_ENV: "x86_64-linux-deb10-llvm"
-
-nightly-x86_64-linux-deb10-llvm:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  variables:
-    BUILD_FLAVOUR: validate+llvm
-    TEST_ENV: "x86_64-linux-deb10-llvm"
-
-
-############################################################
 # GHC-in-GHCi (Hadrian)
 ############################################################
 
@@ -505,9 +303,6 @@ hadrian-ghc-in-ghci:
   before_script:
     # workaround for docker permissions
     - sudo chown ghc:ghc -R .
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
-    - git checkout .gitmodules
   variables:
     GHC_FLAGS: -Werror
   tags:
@@ -541,387 +336,69 @@ stack-hadrian-build:
     - .gitlab/ci.sh configure
     - hadrian/build-stack --version
 
-############################################################
-# Validation via Pipelines (make)
-############################################################
-
-.validate:
-  variables:
-    TEST_TYPE: test
-    MAKE_ARGS: "-Werror"
-  script: |
-    # Build hyperlinked sources for documentation when building releases
-    if [[ "$RELEASE_JOB" = "yes" ]]; then
-      HADDOCK_HYPERLINKED_SOURCES=1
-    fi
-    .gitlab/ci.sh setup
-    .gitlab/ci.sh configure
-    .gitlab/ci.sh build_make
-    .gitlab/ci.sh test_make
-
-  dependencies: []
-  artifacts:
-    reports:
-      junit: junit.xml
-    expire_in: 2 week
-    paths:
-      - $BIN_DIST_PREP_TAR_COMP
-      - junit.xml
-      - performance-metrics.tsv
-
 #################################
-# x86_64-freebsd
+# x86_64-linux-deb10-make
 #################################
 
-.build-x86_64-freebsd:
-  stage: full-build
+# One job still using Make for now but we don't produce any release bindists with it.
+
+.build-x86_64-linux-deb10-make:
   extends: .validate
-  tags:
-    - x86_64-freebsd
-  allow_failure: true
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
   variables:
-    # N.B. we use iconv from ports as I see linker errors when we attempt
-    # to use the "native" iconv embedded in libc as suggested by the
-    # porting guide [1].
-    # [1] https://www.freebsd.org/doc/en/books/porters-handbook/using-iconv.html)
-    CONFIGURE_ARGS: "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib"
-    GHC_VERSION: "8.10.1"
-    CABAL_INSTALL_VERSION: "3.2.0.0"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-portbld-freebsd.tar.xz"
-    TEST_ENV: "x86_64-freebsd"
+    TEST_ENV: "x86_64-linux-deb10-make"
     BUILD_FLAVOUR: "validate"
+    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-deb10-linux.tar.gz"
+  before_script:
+    # workaround for docker permissions
+    - sudo chown ghc:ghc -R .
   after_script:
     - .gitlab/ci.sh save_cache
     - .gitlab/ci.sh clean
     - cat ci-timings
-  artifacts:
-    when: always
-    expire_in: 2 week
-  cache:
-    key: "freebsd-$GHC_VERSION-$CACHE_REV"
-    paths:
-      - cabal-cache
-      - toolchain
-
-# Conditional due to lack of builder capacity
-validate-x86_64-freebsd:
-  extends: .build-x86_64-freebsd
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /.*FreeBSD.*/'
-
-nightly-x86_64-freebsd:
-  <<: *nightly
-  extends: .build-x86_64-freebsd
-
-release-x86_64-freebsd:
-  <<: *release
-  extends: .build-x86_64-freebsd
-
-.build-x86_64-freebsd-hadrian:
-  extends: .validate-hadrian
   tags:
-    - x86_64-freebsd
-  allow_failure: true
-  variables:
-    CONFIGURE_ARGS: "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib"
-    HADRIAN_ARGS: "--docs=no-sphinx"
-    GHC_VERSION: 8.6.3
-    CABAL_INSTALL_VERSION: 3.0.0.0
-    BIN_DIST_NAME: "ghc-x86_64-portbld-freebsd"
-    TEST_ENV: "x86_64-freebsd-hadrian"
-    BUILD_FLAVOUR: "validate"
-  after_script:
-    - .gitlab/ci.sh save_cache
-    - .gitlab/ci.sh clean
-    - cat ci-timings
-  artifacts:
-    when: always
-    expire_in: 2 week
-  cache:
-    key: "freebsd-$GHC_VERSION-$CACHE_REV"
-    paths:
-      - cabal-cache
-      - toolchain
-
-# Disabled due to lack of builder capacity
-.validate-x86_64-freebsd-hadrian:
-  extends: .build-x86_64-freebsd-hadrian
-
-#################################
-# x86_64-darwin
-#################################
+    - x86_64-linux
 
-.build-x86_64-darwin:
-  extends: .validate-hadrian
+validate-x86_64-linux-deb10-make:
+  extends: .build-x86_64-linux-deb10-make
   stage: full-build
-  tags:
-    - x86_64-darwin-m1
-
-  variables:
-    NIX_SYSTEM: x86_64-darwin
-    BUILD_FLAVOUR: "validate"
-    MACOSX_DEPLOYMENT_TARGET: "10.10"
-    # Only Sierra and onwards supports clock_gettime. See #12858
-    ac_cv_func_clock_gettime: "no"
-    # Only newer OS Xs support utimensat. See #17895
-    ac_cv_func_utimensat: "no"
-
-    TEST_TYPE: test
-    MAKE_ARGS: "-Werror"
-    # we run on M1's for now, getconf can't be built with nix yet,
-    # and we use a pure shell, so we can't/shouldn't use /usr/bin/getconf
-    # inside th shell.
-    CPUS: 8
-    LANG: "en_US.UTF-8"
-    # WARNING: this is overridden in the shell.nix, see shell.nix!
-    CONFIGURE_ARGS: "--with-intree-gmp --with-system-libffi"
-    HADRIAN_ARGS: "--docs=no-sphinx"
-    TEST_ENV: "x86_64-darwin-hadrian"
-    BIN_DIST_NAME: "ghc-x86_64-apple-darwin"
-    # Due to #19025
-    IGNORE_PERF_FAILURES: "all"
-
-  script: |
-    # fix up config.sub in libraries for the time.
-    # aarch64-darwin is not supported in older config.sub's
-    find libraries -name config.sub -exec cp config.sub {} \;
-
-    .gitlab/ci.sh setup
-    .gitlab/ci.sh configure
-    .gitlab/ci.sh build_hadrian
-    .gitlab/ci.sh test_hadrian
-    .gitlab/ci.sh save_cache
-
-  after_script:
-    - .gitlab/ci.sh clean
-    - cat ci-timings
-
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-validate-x86_64-darwin:
-  extends: .build-x86_64-darwin
   rules:
     - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
 
-release-x86_64-darwin:
-  <<: *release
-  extends: .build-x86_64-darwin
-
-#################################
-# aarch64-darwin
-#################################
+############################################################
+# Validation via Pipelines (make)
+############################################################
 
-.build-aarch64-darwin:
-  extends: .validate-hadrian
-  stage: full-build
-  tags:
-    - aarch64-darwin-m1
+.validate:
   variables:
-    NIX_SYSTEM: aarch64-darwin
-    BUILD_FLAVOUR: "validate"
     TEST_TYPE: test
     MAKE_ARGS: "-Werror"
-    MACOSX_DEPLOYMENT_TARGET: "11.0"
-    CPUS: 8
-    LANG: "en_US.UTF-8"
-    # WARNING: this is overridden in the shell.nix, see shell.nix!
-    CONFIGURE_ARGS: "--with-intree-gmp --with-system-libffi"
-    HADRIAN_ARGS: "--docs=no-sphinx"
-    BIN_DIST_NAME: "ghc-arm64-apple-darwin"
-    TEST_ENV: "aarch64-darwin-hadrian"
-    # Capi_Ctype_001 Capi_Ctype_002 T12010: Due to #20393
-    BROKEN_TESTS: "Capi_Ctype_001 Capi_Ctype_002 T12010"
-
   script: |
-    # fix up config.sub in libraries for the time.
-    # aarch64-darwin is not supported in older config.sub's
-    find libraries -name config.sub -exec cp config.sub {} \;
-
+    # Build hyperlinked sources for documentation when building releases
+    if [[ "$RELEASE_JOB" = "yes" ]]; then
+      HADDOCK_HYPERLINKED_SOURCES=1
+    fi
     .gitlab/ci.sh setup
     .gitlab/ci.sh configure
-    .gitlab/ci.sh build_hadrian
-    .gitlab/ci.sh test_hadrian
-    .gitlab/ci.sh save_cache
-
-  after_script:
-    - .gitlab/ci.sh clean
-    - cat ci-timings
+    .gitlab/ci.sh build_make
+    .gitlab/ci.sh test_make
 
+  dependencies: []
   artifacts:
-    when: always
+    reports:
+      junit: junit.xml
     expire_in: 2 week
-
-validate-aarch64-darwin:
-  extends: .build-aarch64-darwin
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-release-aarch64-darwin:
-  <<: *release
-  extends: .build-aarch64-darwin
-
-.validate-linux:
-  extends: .validate
-  tags:
-    - x86_64-linux
-  variables:
-    BUILD_FLAVOUR: "validate"
-  before_script:
-    # workaround for docker permissions
-    - sudo chown ghc:ghc -R .
-  after_script:
-    - cp -Rf $HOME/.cabal cabal-cache
-    - cat ci-timings
-  cache:
-    key: linux-$CACHE_REV
     paths:
-      - cabal-cache
-      - toolchain
-
-#################################
-# aarch64-linux-deb10
-#################################
-
-.build-aarch64-linux-deb10:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/aarch64-linux-deb10:$DOCKER_REV"
-  allow_failure: false
-  variables:
-    TEST_ENV: "aarch64-linux-deb10"
-    BIN_DIST_PREP_TAR_COMP: "ghc-aarch64-linux-deb10.tar.xz"
-  cache:
-    key: linux-aarch64-deb10-$CACHE_REV
-  tags:
-    - aarch64-linux
-
-validate-aarch64-linux-deb10:
-  extends: .build-aarch64-linux-deb10
-  artifacts:
-    when: always
-    expire_in: 2 week
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-nightly-aarch64-linux-deb10:
-  <<: *nightly
-  extends: .build-aarch64-linux-deb10
-  variables:
-    TEST_TYPE: slowtest
-
-release-aarch64-linux-deb10:
-  <<: *release
-  extends: .build-aarch64-linux-deb10
-
-.build-aarch64-linux-deb10-llvm:
-  extends: .build-aarch64-linux-deb10
-  stage: full-build
-  variables:
-  variables:
-    TEST_ENV: "aarch64-linux-deb10-llvm"
-    BIN_DIST_PREP_TAR_COMP: "ghc-aarch64-linux-deb10-llvm.tar.xz"
-    BUILD_FLAVOUR: perf-llvm
-  tags:
-    - aarch64-linux
-
-validate-aarch64-linux-deb10-llvm:
-  <<: *nightly
-  extends: .build-aarch64-linux-deb10-llvm
-  variables:
-    CONFIGURE_ARGS: "CC=/opt/llvm/bin/clang"
-    RUNTEST_ARGS: "--way=llvm"
-    BUILD_FLAVOUR: perf-llvm
-    # No docs, for this build, slows it down unncessarily.
-    # We build docs on other platforms already anyway.
-    BUILD_SPHINX_HTML: "NO"
-    BUILD_SPHINX_INFO: "NO"
-    BUILD_SPHINX_PDF: "NO"
-    BUILD_SPHINX_MAN: "NO"
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-#################################
-# armv7-linux-deb10
-#################################
-
-.build-armv7-linux-deb10:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/armv7-linux-deb10:$DOCKER_REV"
-  # Due to linker issues
-  allow_failure: true
-  variables:
-    TEST_ENV: "armv7-linux-deb10"
-    BIN_DIST_PREP_TAR_COMP: "ghc-armv7-linux-deb10.tar.xz"
-    CONFIGURE_ARGS: "--host=armv7-linux-gnueabihf --build=armv7-linux-gnueabihf --target=armv7-linux-gnueabihf"
-    # N.B. We disable ld.lld explicitly here because it appears to fail
-    # non-deterministically on ARMv7. See #18280.
-    LD: "ld.gold"
-    GccUseLdOpt: "-fuse-ld=gold"
-  cache:
-    key: linux-armv7-deb10-$CACHE_REV
-  tags:
-    - armv7-linux
-
-# Disabled as the build takes over 4 hours
-.validate-armv7-linux-deb10:
-  extends: .build-armv7-linux-deb10
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-nightly-armv7-linux-deb10:
-  <<: *nightly
-  extends: .build-armv7-linux-deb10
-  variables:
-    TEST_TYPE: slowtest
-
-release-armv7-linux-deb10:
-  <<: *release
-  extends: .build-armv7-linux-deb10
-
-#################################
-# i386-linux-deb9
-#################################
-
-.build-i386-linux-deb9:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV"
-  variables:
-    TEST_ENV: "i386-linux-deb9"
-    BIN_DIST_PREP_TAR_COMP: "ghc-i386-deb9-linux.tar.xz"
-  cache:
-    key: linux-i386-deb9-$CACHE_REV
-
-validate-i386-linux-deb9:
-  extends: .build-i386-linux-deb9
-  artifacts:
-    when: always
-    expire_in: 2 week
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-nightly-i386-linux-deb9:
-  <<: *nightly
-  extends: .build-i386-linux-deb9
-  variables:
-    TEST_TYPE: slowtest
-
-release-i386-linux-deb9:
-  <<: *release
-  extends: .build-i386-linux-deb9
-
+      - $BIN_DIST_PREP_TAR_COMP
+      - junit.xml
+      - performance-metrics.tsv
 
 ####################################
 # Testing reinstallable ghc codepath
 ####################################
 
 test-cabal-reinstall-x86_64-linux-deb10:
-  extends: .build-x86_64-linux-deb10-hadrian
+  extends: nightly-x86_64-linux-deb10-validate
   stage: full-build
   before_script:
     - ./boot
@@ -934,319 +411,34 @@ test-cabal-reinstall-x86_64-linux-deb10:
   rules:
     - if: $NIGHTLY
 
-#################################
-# x86_64-linux-deb11
-#################################
-
-.build-x86_64-linux-deb11:
-  extends: .validate-linux
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb11:$DOCKER_REV"
-  variables:
-    TEST_ENV: "x86_64-linux-deb11"
-    BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-deb11-linux.tar.xz"
-  cache:
-    key: linux-x86_64-deb11-$CACHE_REV
-
-# Disabled to reduce CI load
-.validate-x86_64-linux-deb11:
-  extends: .build-x86_64-linux-deb11
-  stage: full-build
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-release-x86_64-linux-deb11:
-  <<: *release
-  extends: .build-x86_64-linux-deb11
-  stage: full-build
-
-nightly-x86_64-linux-deb11:
-  <<: *nightly
-  extends: .build-x86_64-linux-deb11
-  stage: full-build
-  variables:
-    TEST_TYPE: slowtest
-
-#################################
-# x86_64-linux-ubuntu 20.04
-#################################
-
-.build-x86_64-linux-ubuntu2004:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-ubuntu20_04:$DOCKER_REV"
-  variables:
-    TEST_ENV: "x86_64-linux-ubuntu2004"
-    BIN_DIST_PREP_TAR_COMP: "./ghc-x86_64-ubuntu2004-linux.tar.xz"
-  cache:
-    key: linux-x86_64-ubuntu2004-$CACHE_REV
-
-# Disabled to alleviate CI load
-.validate-x86_64-linux-ubuntu2004:
-  extends: .build-x86_64-linux-ubuntu2004
-  stage: full-build
-
-nightly-x86_64-linux-ubuntu2004:
-  <<: *nightly
-  extends: .build-x86_64-linux-ubuntu2004
-  variables:
-    TEST_TYPE: slowtest
-
-release-x86_64-linux-ubuntu2004:
-  <<: *release
-  extends: .build-x86_64-linux-ubuntu2004
-
-#################################
-# x86_64-linux-alpine
-#################################
-
-.build-x86_64-linux-alpine-hadrian:
-  extends: .build-x86_64-linux-deb10-hadrian
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine3_12:$DOCKER_REV"
-  # There are currently a few failing tests
-  allow_failure: true
-  variables:
-    TEST_ENV: "x86_64-linux-alpine"
-    BUILD_FLAVOUR: "validate+fully_static"
-    BIN_DIST_NAME: "ghc-x86_64-alpine-linux"
-    # Can't use ld.gold due to #13958.
-    CONFIGURE_ARGS: "--disable-ld-override"
-    INSTALL_CONFIGURE_ARGS: "--disable-ld-override"
-    HADRIAN_ARGS: "--docs=no-sphinx"
-    # encoding004: due to lack of locale support
-    # T10458, ghcilink002: due to #17869
-    # linker_unload_native: due to musl not supporting any means of probing dynlib dependencies
-    #   (see Note [Object unloading]).
-    BROKEN_TESTS: "encoding004 T10458 ghcilink002 linker_unload_native"
-  cache:
-    key: linux-x86_64-alpine-$CACHE_REV
-  artifacts:
-    when: always
-    expire_in: 2 week
-
-validate-x86_64-linux-alpine-hadrian:
-  extends: .build-x86_64-linux-alpine-hadrian
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-release-x86_64-linux-alpine-integer-simple:
-  <<: *release
-  extends: .build-x86_64-linux-alpine-hadrian
-  variables:
-    BIGNUM_BACKEND: native
-    BUILD_FLAVOUR: "perf+fully_static"
-
-release-x86_64-linux-alpine-integer-gmp:
-  <<: *release
-  extends: .build-x86_64-linux-alpine-hadrian
-  variables:
-    BIGNUM_BACKEND: gmp
-    BUILD_FLAVOUR: "perf+fully_static"
-
-nightly-x86_64-linux-alpine:
-  <<: *nightly
-  extends: .build-x86_64-linux-alpine-hadrian
-
-#################################
-# x86_64-linux-centos7
-#################################
-
-.build-x86_64-linux-centos7:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
-  variables:
-    # The sphinx release shipped with Centos 7 fails to build out documentation
-    BUILD_SPHINX_HTML: "NO"
-    BUILD_SPHINX_PDF: "NO"
-    TEST_ENV: "x86_64-linux-centos7"
-    IGNORE_PERF_FAILURES: "all"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-centos7-linux.tar.xz"
-    # CentOS seems to default to ascii
-    LANG: "en_US.UTF-8"
-  cache:
-    key: linux-x86_64-centos7-$CACHE_REV
-
-release-x86_64-linux-centos7:
-  <<: *release
-  extends: .build-x86_64-linux-centos7
-
-#################################
-# x86_64-linux-fedora33
-#################################
-
-.build-x86_64-linux-fedora33:
-  extends: .validate-linux
-  stage: full-build
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
-  variables:
-    # LLVM 10 is not available for Fedora33
-    LLC: /bin/false
-    OPT: /bin/false
-    TEST_ENV: "x86_64-linux-fedora33"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-fedora33-linux.tar.xz"
-  cache:
-    key: linux-x86_64-fedora33-$CACHE_REV
-  artifacts:
-    when: always
-    # These are used for head.hackage jobs therefore we keep them around for
-    # longer.
-    expire_in: 8 week
-
-validate-x86_64-linux-fedora33:
-  extends: .build-x86_64-linux-fedora33
-  rules:
-    - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-release-x86_64-linux-fedora33:
-  <<: *release
-  extends: .build-x86_64-linux-fedora33
-
-
-release-x86_64-linux-fedora33-dwarf:
-  <<: *release
-  extends: .build-x86_64-linux-fedora33
-  variables:
-    CONFIGURE_ARGS: "--enable-dwarf-unwind"
-    BUILD_FLAVOUR: dwarf
-    IGNORE_PERF_FAILURES: "all"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-fedora33-linux-dwarf.tar.xz"
-    TEST_ENV: "x86_64-linux-fedora33-dwarf"
-
-############################################################
-# Validation via Pipelines (Windows)
-############################################################
-
-.build-windows:
-  before_script:
-    - git clean -xdf
-
-    # Setup toolchain
-    - bash .gitlab/ci.sh setup
-  after_script:
-    - bash .gitlab/ci.sh save_cache
-    - bash .gitlab/ci.sh clean
-    - type ci-timings
-  dependencies: []
-  variables:
-    #FORCE_SYMLINKS: 1
-    LANG: "en_US.UTF-8"
-    SPHINXBUILD: "/mingw64/bin/sphinx-build.exe"
-    CABAL_INSTALL_VERSION: "3.2.0.0"
-    GHC_VERSION: "8.10.4"
-  cache:
-    paths:
-      - cabal-cache
-      - toolchain
-      - ghc-tarballs
-
-.build-windows-hadrian:
-  extends: .build-windows
-  stage: full-build
-  variables:
-    BUILD_FLAVOUR: "validate"
-    # skipping perf tests for now since we build a quick-flavoured GHC,
-    # which might result in some broken perf tests?
-    HADRIAN_ARGS: "--docs=no-sphinx --skip-perf"
-
-  script:
-    - bash .gitlab/ci.sh configure
-    - bash .gitlab/ci.sh build_hadrian
-    - bash .gitlab/ci.sh test_hadrian
-  tags:
-    - new-x86_64-windows
-    - test
-  artifacts:
-    reports:
-      junit: junit.xml
-    expire_in: 2 week
-    when: always
-    paths:
-      - "$BIN_DIST_NAME.tar.xz"
-      - junit.xml
-
-.build-x86_64-windows-hadrian:
-  extends: .build-windows-hadrian
-  variables:
-    MSYSTEM: MINGW64
-    TEST_ENV: "x86_64-windows"
-    BIN_DIST_NAME: "ghc-x86_64-unknown-mingw32"
-  cache:
-    key: "x86_64-windows-$CACHE_REV"
-
-validate-x86_64-windows-hadrian:
-  extends: .build-x86_64-windows-hadrian
-
-.build-windows-make:
-  extends: .build-windows
-  stage: full-build
-  variables:
-    BUILD_FLAVOUR: "quick"
-    BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-mingw32.tar.xz"
-  script:
-    - bash .gitlab/ci.sh configure
-    - bash .gitlab/ci.sh build_make
-    - bash .gitlab/ci.sh test_make
-  tags:
-    - new-x86_64-windows
-    - test
-  artifacts:
-    when: always
-    expire_in: 2 week
-    reports:
-      junit: junit.xml
-    paths:
-      # N.B. variable interpolation apparently doesn't work on Windows so
-      # this can't be $BIN_DIST_PREP_TAR_COMP
-      - "ghc-x86_64-mingw32.tar.xz"
-      - junit.xml
-
-.build-x86_64-windows-make:
-  extends: .build-windows-make
-  variables:
-    MSYSTEM: MINGW64
-    TEST_ENV: "x86_64-windows"
-  cache:
-    key: "x86_64-windows-$CACHE_REV"
-
-nightly-x86_64-windows:
-  <<: *nightly
-  extends: .build-x86_64-windows-make
-  stage: full-build
-  variables:
-    BUILD_FLAVOUR: "validate"
-
-# Normal Windows validate builds lack profiled libraries; that won't do for
-# releases.
-release-x86_64-windows:
-  <<: *release
-  extends: .build-x86_64-windows-hadrian
-
-release-x86_64-windows-integer-simple:
-  <<: *release
-  extends: .build-x86_64-windows-hadrian
-  variables:
-    BIGNUM_BACKEND: native
-    BIN_DIST_NAME: "ghc-x86_64-mingw32-unknown-nogmp"
-
-
 ############################################################
 # Packaging
 ############################################################
 
 doc-tarball:
   stage: packaging
-  needs: [validate-x86_64-linux-deb10-debug, validate-x86_64-windows-hadrian, validate-x86_64-linux-deb10-unreg-hadrian]
+  needs:
+    - job: x86_64-linux-deb10-numa-slow-validate
+      optional: true
+    - job: nightly-x86_64-linux-deb10-validate
+      optional: true
+    - job: release-x86_64-linux-deb10-perf
+      optional: true
+
+    - job: x86_64-windows-validate
+      optional: true
+    - job: nightly-x86_64-windows-validate
+      optional: true
+    - job: release-x86_64-windows-perf
+      optional: true
+
   tags:
     - x86_64-linux
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  dependencies:
-    - validate-x86_64-linux-deb10-debug
-    - validate-x86_64-windows-hadrian
+  dependencies: null
   variables:
-    LINUX_BINDIST: "ghc-x86_64-deb10-linux-debug.tar.xz"
-    WINDOWS_BINDIST: "ghc-x86_64-unknown-mingw32.tar.xz"
+    LINUX_BINDIST: "ghc-x86_64-linux-deb10.tar.xz"
+    WINDOWS_BINDIST: "ghc-x86_64-windows.tar.xz"
   artifacts:
     paths:
       - haddock.html.tar.xz
@@ -1256,6 +448,13 @@ doc-tarball:
       - "*.pdf"
   script:
     - |
+      mv "ghc-x86_64-linux-deb10-numa-slow-validate.tar.xz" "$LINUX_BINDIST" \
+        || mv "ghc-x86_64-linux-deb10-validate.tar.xz" "$LINUX_BINDIST" \
+        || mv "ghc-x86_64-linux-deb10-perf.tar.xz" "$LINUX_BINDIST" \
+        || true
+      mv "ghc-x86_64-windows-validate.tar.xz" "$WINDOWS_BINDIST" \
+        || mv "ghc-x86-windows-perf.tar.xz" "$WINDOWS_BINDIST" \
+        || true
       if [ ! -f "$LINUX_BINDIST" ]; then
         echo "Error: $LINUX_BINDIST does not exist. Did the Debian 9 job fail?"
         exit 1
@@ -1289,15 +488,13 @@ source-tarball:
     - if: $NIGHTLY
 
 
-
-
 test-bootstrap:
   stage: full-build
   needs: [source-tarball]
   tags:
     - x86_64-linux
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
-  dependencies: [source-tarball]
+  dependencies: null
   script:
     - mkdir test-bootstrap
     - tar -xf ghc-*[0-9]-src.tar.xz -C test-bootstrap
@@ -1382,10 +579,17 @@ perf-nofib:
   # Hence we allow this job to fail.
   allow_failure: true
   stage: testing
-  needs: [validate-x86_64-linux-deb10-dwarf, doc-tarball]
-  dependencies:
-    - validate-x86_64-linux-deb10-dwarf
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  needs:
+    - job: x86_64-linux-fedora33-perf
+      optional: true
+    - job: nightly-x86_64-linux-fedora33-perf
+      optional: true
+    - job: release-x86_64-linux-fedora33-perf
+      optional: true
+
+    - job: doc-tarball
+      optional: false
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
   rules:
     - if: $CI_MERGE_REQUEST_ID
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -1399,7 +603,7 @@ perf-nofib:
     - root=$(pwd)/ghc
     - |
       mkdir tmp
-      tar -xf ../ghc-x86_64-deb10-linux-dwarf.tar.xz -C tmp
+      tar -xf ../ghc-x86_64-linux-fedora33-perf.tar.xz -C tmp
       pushd tmp/ghc-*/
       ./configure --prefix=$root
       make install
@@ -1424,10 +628,17 @@ perf-nofib:
 
 perf:
   stage: testing
-  needs: [validate-x86_64-linux-deb10-dwarf, doc-tarball]
-  dependencies:
-    - validate-x86_64-linux-deb10-dwarf
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV"
+  needs:
+    - job: x86_64-linux-fedora33-perf
+      optional: true
+    - job: nightly-x86_64-linux-fedora33-perf
+      optional: true
+    - job: release-x86_64-linux-fedora33-perf
+      optional: true
+    - job: doc-tarball
+      optional: false
+  dependencies: null
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
   rules:
     - if: $CI_MERGE_REQUEST_ID
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -1438,7 +649,7 @@ perf:
     - root=$(pwd)/ghc
     - |
       mkdir tmp
-      tar -xf ghc-x86_64-deb10-linux-dwarf.tar.xz -C tmp
+      tar -xf ghc-x86_64-linux-fedora33-perf.tar.xz -C tmp
       pushd tmp/ghc-*/
       ./configure --prefix=$root
       make install
@@ -1463,8 +674,7 @@ perf:
 pages:
   stage: deploy
   needs: [doc-tarball]
-  dependencies:
-    - doc-tarball
+  dependencies: null
   image: ghcci/x86_64-linux-deb9:0.2
   # See #18973
   allow_failure: true