summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZubin Duggal <zubin.duggal@gmail.com>2021-06-20 18:45:27 +0530
committerZubin Duggal <zubin.duggal@gmail.com>2021-06-20 19:12:22 +0530
commite0b858af7a6617372908fc29aa3c9b111e8f35fe (patch)
tree8db0dd7706b55f54afd3723c62686def0d2bccba
parentac0f5179e8838ffb3eb657b25762735502da6509 (diff)
downloadhaskell-wip/8.10.6-fixes.tar.gz
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-x.gitlab/ci.sh16
2 files changed, 12 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37fbecc903..36de5e81a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,10 @@ default:
interruptible: true
stages:
+ - full-build # Build all the things
- lint # Source linting
- quick-build # A very quick smoke-test to weed out broken commits
- build # A quick smoke-test to weed out broken commits
- - full-build # Build all the things
- packaging # Source distribution, etc.
- testing # head.hackage correctness and compiler performance testing
- deploy # push documentation
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 8a313fc4d6..c425703344 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -283,11 +283,11 @@ function prepare_build_mk() {
cat > mk/build.mk <<EOF
V=1
-HADDOCK_DOCS=YES
-LATEX_DOCS=YES
-HSCOLOUR_SRCS=YES
-BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
-BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF
+HADDOCK_DOCS=NO
+LATEX_DOCS=NO
+HSCOLOUR_SRCS=NO
+BUILD_SPHINX_HTML=NO
+BUILD_SPHINX_PDF=NO
BeConservative=YES
INTEGER_LIBRARY=$INTEGER_LIBRARY
@@ -309,6 +309,8 @@ EOF
info "build.mk is:"
cat mk/build.mk
+ info "INTEGER_LIBRARY is:"
+ make show! VALUE=INTEGER_LIBRARY
}
function configure() {
@@ -346,6 +348,10 @@ function build_make() {
echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk
echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk
+ info "build.mk is:"
+ cat mk/build.mk
+ info "INTEGER_LIBRARY is:"
+ make show! VALUE=INTEGER_LIBRARY
run "$MAKE" -j"$cores" $MAKE_ARGS
run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
ls -lh "$BIN_DIST_PREP_TAR_COMP"