From 08e67a55bd917829955672adf02060ce6516c852 Mon Sep 17 00:00:00 2001
From: sheaf <sam.derbyshire@gmail.com>
Date: Wed, 18 May 2022 17:21:43 +0200
Subject: [PATCH] Hadrian bootstrap backport: update gitlab-ci.yml
Some of the other changes (e.g. reinstallable ghc) have not been
backported to the ghc-9.2 branch, so we remove those CI jobs.
---
.gitlab-ci.yml | 51 --------------------------------------------------
1 file changed, 51 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e86af4d911fb..e7e574dac1bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -929,57 +929,6 @@ nightly-x86_64-linux-deb10-llvm:
BUILD_FLAVOUR: perf-llvm
TEST_ENV: "x86_64-linux-deb10-llvm"
-####################################
-# Testing reinstallable ghc codepath
-####################################
-
-test-cabal-reinstall-x86_64-linux-deb10:
- extends: .validate-linux-hadrian
- stage: full-build
- before_script:
- - ./boot
- - ./configure
- - "cabal update --index=$HACKAGE_INDEX_STATE --project-file=cabal.project-reinstall"
- variables:
- REINSTALL_GHC: "yes"
- BUILD_FLAVOUR: validate
- TEST_ENV: "x86_64-linux-deb10-cabal-install"
- rules:
- - if: '$CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/'
-
-#################################
-# 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
#################################
--
GitLab