@@ -26,7 +26,7 @@ if [ -d "$ENV_DIR" ]; then
28WORK_DIR=/app
28WORK_DIR=/app
29−cp -Rp "$BUILD_DIR/." "$WORK_DIR"
29+cp -R "$BUILD_DIR/." "$WORK_DIR"
30mkdir -p "$WORK_DIR/vendor/bin"
30mkdir -p "$WORK_DIR/vendor/bin"
31mkdir -p "$WORK_DIR/vendor/ghc-libs"
31mkdir -p "$WORK_DIR/vendor/ghc-libs"
@@ -45,7 +45,7 @@ function set-default-env (){
47export LANG=en_US.UTF-8
47export LANG=en_US.UTF-8
48−export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib:$LIBRARY_PATH
48+export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:/usr/lib:$LIBRARY_PATH
49export LD_LIBRARY_PATH=$LIBRARY_PATH
49export LD_LIBRARY_PATH=$LIBRARY_PATH
50export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
50export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
51export STACK_ROOT=$CACHE_DIR/.stack
51export STACK_ROOT=$CACHE_DIR/.stack
@@ -60,10 +60,10 @@ if [ ! -e "$LIBGMP_DIR" ]; then
60 curl -# -L "$LIBGMP_URL" | tar xz -C "$LIBGMP_DIR"
60 curl -# -L "$LIBGMP_URL" | tar xz -C "$LIBGMP_DIR"
62speak "Restoring $LIBGMP_VER files from cache"
62speak "Restoring $LIBGMP_VER files from cache"
63−cp -Rp "$LIBGMP_DIR/ghc-libs/." "$WORK_DIR/vendor/ghc-libs"
63+cp -R "$LIBGMP_DIR/ghc-libs/." "$WORK_DIR/vendor/ghc-libs"
65########## stack exe ###############################################
65########## stack exe ###############################################
66−STACK_VER=${STACK_VER:-2.1.3}
66+STACK_VER=${STACK_VER:-1.1.2}
67STACK_URL=${STACK_URL:-https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VER"/stack-"$STACK_VER"-linux-x86_64.tar.gz}
67STACK_URL=${STACK_URL:-https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VER"/stack-"$STACK_VER"-linux-x86_64.tar.gz}
68STACK_DIR="$CACHE_DIR/stack-$STACK_VER"
68STACK_DIR="$CACHE_DIR/stack-$STACK_VER"
69STACK_EXE="$STACK_DIR/stack"
69STACK_EXE="$STACK_DIR/stack"
@@ -86,28 +86,20 @@ fi
86SANDBOX_DIR="$CACHE_DIR/.stack-work"
86SANDBOX_DIR="$CACHE_DIR/.stack-work"
87if [ -e "$SANDBOX_DIR" ]; then
87if [ -e "$SANDBOX_DIR" ]; then
88 speak "Restoring .stack-work"
88 speak "Restoring .stack-work"
89− cp -Rp "$SANDBOX_DIR" "$WORK_DIR"
89+ cp -R "$SANDBOX_DIR" "$WORK_DIR"
91 mkdir -p "$SANDBOX_DIR"
91 mkdir -p "$SANDBOX_DIR"
94speak "Running stack"
94speak "Running stack"
95cd "$WORK_DIR"
95cd "$WORK_DIR"
96−# Makefile support (if you need other build tools than Stack that you need to use in conjunction)
97−if [ -f "$BUILD_DIR/Makefile" ]; then
98− speak "Makefile detected"
102− stack setup
96+stack setup
104− stack build --ghc-options='-O2' --copy-bins
97+stack build --fast --copy-bins
107# Set context environment variables.
99# Set context environment variables.
108−set-env PATH "$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:\$PATH"
100+set-env PATH "$WORK_DIR/.local/bin:$PATH"
109−set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
101+set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
110−set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
102+set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
112speak "Making stack binaries available"
104speak "Making stack binaries available"
113mkdir -p "$BUILD_DIR/vendor"
105mkdir -p "$BUILD_DIR/vendor"
@@ -117,6 +109,6 @@ mv "$WORK_DIR/.local/bin" "$BUILD_DIR/.local"
118speak "Caching .stack-work"
110speak "Caching .stack-work"
119rsync -avq "$WORK_DIR/.stack-work/" "$SANDBOX_DIR"
111rsync -avq "$WORK_DIR/.stack-work/" "$SANDBOX_DIR"
120−cp -Rp "$WORK_DIR/.stack-work" "$BUILD_DIR"
112+mv "$WORK_DIR/.stack-work" "$BUILD_DIR"
122speak "Finished!"
114speak "Finished!"