diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-11-30 18:58:49 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-12-03 23:11:31 -0500 |
| commit | 33ec3a0600fe8c009ab8ed6d86941a8fd88fb033 (patch) | |
| tree | 8b901548c2bcb63fcefb8a94984f2ccfc1b8d9cb /.gitlab | |
| parent | e0b08c5f445f70381c854f78913489685feb224e (diff) | |
| download | haskell-33ec3a0600fe8c009ab8ed6d86941a8fd88fb033.tar.gz | |
gitlab-ci: Run linters through ci.sh
Ensuring that the right toolchain is used.
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 22253e974c..457db1c0fa 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -442,9 +442,6 @@ function test_make() { } function build_hadrian() { - if [ -z "$BUILD_FLAVOUR" ]; then - fail "BUILD_FLAVOUR not set" - fi if [ -z "$BIN_DIST_NAME" ]; then fail "BIN_DIST_NAME not set" fi @@ -506,6 +503,9 @@ function clean() { } function run_hadrian() { + if [ -z "$BUILD_FLAVOUR" ]; then + fail "BUILD_FLAVOUR not set" + fi if [ -z "$BIGNUM_BACKEND" ]; then BIGNUM_BACKEND="gmp"; fi if [ -n "$VERBOSE" ]; then HADRIAN_ARGS="$HADRIAN_ARGS -V"; fi run hadrian/build-cabal \ @@ -575,7 +575,7 @@ case $1 in test_hadrian || res=$? push_perf_notes exit $res ;; - run_hadrian) run_hadrian $@ ;; + run_hadrian) shift; run_hadrian $@ ;; perf_test) run_perf_test ;; clean) clean ;; shell) shell $@ ;; |