git.iko.soy/streamly
on master help sign in
Fix quoting issue in flag passing
9e28080Harendra Kumar
bin/run-ci.sh+5−3
compare with master
unifiedsplit
@@ -24,14 +24,16 @@ GHC_PRIME_VER="8.10"
24JOBS=1
24JOBS=1
25
25
26# Without cabal project file, it will not run any tests
26# Without cabal project file, it will not run any tests
27+# XXX Added DISABLE_SDIST_BUILD because of a cabal issue
27ghc_prime_dist () {
28ghc_prime_dist () {
28 nix-shell \
29 nix-shell \
29 --argstr compiler "$GHC_PRIME_NIX" \
30 --argstr compiler "$GHC_PRIME_NIX" \
30 --run "\
31 --run "\
31 packcheck.sh cabal-v2 \
32 packcheck.sh cabal-v2 \
32 GHCVER=$GHC_PRIME_VER \
33 GHCVER=$GHC_PRIME_VER \
33− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
34+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
34 CABAL_DISABLE_DEPS=y \
35 CABAL_DISABLE_DEPS=y \
36+ DISABLE_SDIST_BUILD=y \
35 CABAL_CHECK_RELAX=y"
37 CABAL_CHECK_RELAX=y"
36}
38}
37
39
@@ -42,7 +44,7 @@ ghc_prime_dist_tests () {
42 --run "\
44 --run "\
43 packcheck.sh cabal-v2 \
45 packcheck.sh cabal-v2 \
44 GHCVER=$GHC_PRIME_VER \
46 GHCVER=$GHC_PRIME_VER \
45− CABAL_BUILD_OPTIONS="$CABAL_BUILD_OPTIONS --jobs=$JOBS" \
47+ CABAL_BUILD_OPTIONS=\"$CABAL_BUILD_OPTIONS --jobs=$JOBS\" \
46 CABAL_PROJECT=cabal.project \
48 CABAL_PROJECT=cabal.project \
47 CABAL_DISABLE_DEPS=y \
49 CABAL_DISABLE_DEPS=y \
48 CABAL_CHECK_RELAX=y"
50 CABAL_CHECK_RELAX=y"
@@ -55,7 +57,7 @@ ghc_prime_dist_tests_stack () {
55 --run "\
57 --run "\
56 packcheck.sh stack \
58 packcheck.sh stack \
57 GHCVER=$GHC_PRIME_VER \
59 GHCVER=$GHC_PRIME_VER \
58− STACK_BUILD_OPTIONS="--jobs $JOBS --system-ghc" \
60+ STACK_BUILD_OPTIONS=\"--jobs $JOBS --system-ghc\" \
59 STACK_YAML=stack.yaml"
61 STACK_YAML=stack.yaml"
60}
62}
61
63