summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheng Shao <astrohavoc@gmail.com>2022-09-06 05:28:14 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-09-06 15:37:35 -0400
commit808bb7934e1e3007bf7115bdf75263bba937c85b (patch)
tree16647da77f6a2db912d235b64e962a6365a27764
parentd4f908f7dff34c650fd3cf26dbba1d5b66c13dbc (diff)
downloadhaskell-808bb7934e1e3007bf7115bdf75263bba937c85b.tar.gz
ci: remove unused build_make/test_make in ci script
-rwxr-xr-x.gitlab/ci.sh46
1 files changed, 0 insertions, 46 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 1a15ea3eb4..2faddb8639 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -50,11 +50,6 @@ Common Modes:
shell Run an interactive shell with a configured build environment.
save_cache Preserve the cabal cache
-Make build system:
-
- build_make Build GHC via the make build system
- test_make Test GHC via the make build system
-
Hadrian build system
build_hadrian Build GHC via the Hadrian build system
test_hadrian Test GHC via the Hadrian build system
@@ -436,23 +431,6 @@ function configure() {
end_section "configuring"
}
-function build_make() {
- check_release_build
- prepare_build_mk
- if [[ -z "$BIN_DIST_PREP_TAR_COMP" ]]; then
- fail "BIN_DIST_PREP_TAR_COMP is not set"
- fi
- if [[ -n "${VERBOSE:-}" ]]; then
- MAKE_ARGS="${MAKE_ARGS:-} V=1"
- else
- MAKE_ARGS="${MAKE_ARGS:-} V=0"
- fi
-
- run "$MAKE" -j"$cores" "$MAKE_ARGS"
- run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
- ls -lh "$BIN_DIST_PREP_TAR_COMP"
-}
-
function fetch_perf_notes() {
info "Fetching perf notes..."
"$TOP/.gitlab/test-metrics.sh" pull
@@ -508,23 +486,6 @@ function check_release_build() {
fi
}
-function test_make() {
- if [ -n "${CROSS_TARGET:-}" ]; then
- info "Can't test cross-compiled build."
- return
- fi
-
- check_msys2_deps inplace/bin/ghc-stage2 --version
- check_release_build
-
- run "$MAKE" test_bindist TEST_PREP=YES TEST_PROF=${RELEASE_JOB:-}
- (unset $(compgen -v | grep CI_*);
- run "$MAKE" V=0 VERBOSE=1 test \
- THREADS="$cores" \
- JUNIT_FILE=../../junit.xml \
- EXTRA_RUNTEST_OPTS="${RUNTEST_ARGS:-}")
-}
-
function build_hadrian() {
if [ -z "${BIN_DIST_NAME:-}" ]; then
fail "BIN_DIST_NAME not set"
@@ -842,13 +803,6 @@ case $1 in
usage) usage ;;
setup) setup && cleanup_submodules ;;
configure) time_it "configure" configure ;;
- build_make) time_it "build" build_make ;;
- test_make)
- fetch_perf_notes
- res=0
- time_it "test" test_make || res=$?
- push_perf_notes
- exit $res ;;
build_hadrian) time_it "build" build_hadrian ;;
# N.B. Always push notes, even if the build fails. This is okay to do as the
# testsuite driver doesn't record notes for tests that fail due to