gitlab-ci: Drop make build validation jobs

In preparation for removal of the `make`-based build system

2 files changed, 0 insertions, 59 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8d17fb3ac..6ed24d600b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -382,64 +382,6 @@ stack-hadrian-build:
     - .gitlab/ci.sh configure
     - hadrian/build-stack --version
 
-#################################
-# x86_64-linux-deb10-make
-#################################
-
-# 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
-  # Sadly we cannot bootstrap the make build system with 9.2 due to #21188.
-  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:885dfba7f74583d6a394dbf711cc805178cfcc47"
-  variables:
-    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
-  tags:
-    - x86_64-linux
-
-validate-x86_64-linux-deb10-make:
-  extends: .build-x86_64-linux-deb10-make
-  stage: full-build
-  rules:
-    - if: '($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != "yes")'
-
-############################################################
-# 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
-
 ####################################
 # Testing reinstallable ghc codepath
 ####################################
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index f55d4e1f92..906a9ffc81 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -718,7 +718,6 @@ function save_cache () {
 
 function clean() {
   rm -R tmp
-  run "$MAKE" --quiet clean || true
   run rm -Rf _build
 }