@@ -26,7 +26,7 @@ if [ -d "$ENV_DIR" ]; then
2626fi
2727
2828WORK_DIR=/app
29−mkdir -p "$WORK_DIR/vendor"
29+cp -Rp "$BUILD_DIR/." "$WORK_DIR"
3030mkdir -p "$WORK_DIR/vendor/bin"
3131mkdir -p "$WORK_DIR/vendor/ghc-libs"
3232
@@ -45,7 +45,7 @@ function set-default-env (){
4545}
4646
4747export LANG=en_US.UTF-8
48−export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:/usr/lib:$LIBRARY_PATH
48+export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib:$LIBRARY_PATH
4949export LD_LIBRARY_PATH=$LIBRARY_PATH
5050export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
5151export STACK_ROOT=$CACHE_DIR/.stack
@@ -60,10 +60,10 @@ if [ ! -e "$LIBGMP_DIR" ]; then
6060 curl -# -L "$LIBGMP_URL" | tar xz -C "$LIBGMP_DIR"
6161fi
6262speak "Restoring $LIBGMP_VER files from cache"
63−rsync -avq "$LIBGMP_DIR/ghc-libs/" "$WORK_DIR/vendor/ghc-libs"
63+cp -Rp "$LIBGMP_DIR/ghc-libs/." "$WORK_DIR/vendor/ghc-libs"
6464
6565########## stack exe ###############################################
66−STACK_VER=${STACK_VER:-1.1.2}
66+STACK_VER=${STACK_VER:-2.1.3}
6767STACK_URL=${STACK_URL:-https://github.com/commercialhaskell/stack/releases/download/v"$STACK_VER"/stack-"$STACK_VER"-linux-x86_64.tar.gz}
6868STACK_DIR="$CACHE_DIR/stack-$STACK_VER"
6969STACK_EXE="$STACK_DIR/stack"
@@ -73,7 +73,7 @@ if [ ! -e "$STACK_EXE" ]; then
7373 curl -# -L "$STACK_URL" | tar xz -C "$STACK_DIR" --strip-components=1
7474fi
7575speak "Restoring stack-$STACK_VER"
76−rsync -avq "$STACK_EXE" "$WORK_DIR/vendor/bin/stack"
76+cp "$STACK_EXE" "$WORK_DIR/vendor/bin/stack"
7777chmod a+x "$WORK_DIR/vendor/bin/stack"
7878
7979########## stack vars ##############################################
@@ -83,15 +83,31 @@ if [ -d "$ENV_DIR" ]; then
8383fi
8484
8585########## project build ###########################################
86+SANDBOX_DIR="$CACHE_DIR/.stack-work"
87+if [ -e "$SANDBOX_DIR" ]; then
88+ speak "Restoring .stack-work"
89+ cp -Rp "$SANDBOX_DIR" "$WORK_DIR"
90+else
91+ mkdir -p "$SANDBOX_DIR"
92+fi
93+
8694speak "Running stack"
87−cd "$BUILD_DIR"
88−stack setup
89−stack build --copy-bins
95+cd "$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"
99+ make
100+ make install
101+else
102+ stack setup
103+ stack clean
104+ stack build --ghc-options='-O2' --copy-bins
105+fi
90106
91107# Set context environment variables.
92−set-env PATH "$WORK_DIR/.local/bin:$PATH"
93−set-default-env LIBRARY_PATH /app/vendor/ghc-libs:/usr/lib
94−set-default-env LD_LIBRARY_PATH /app/vendor/ghc-libs:/usr/lib
108+set-env PATH "$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:\$PATH"
109+set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
110+set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
95111
96112speak "Making stack binaries available"
97113mkdir -p "$BUILD_DIR/vendor"
@@ -99,4 +115,8 @@ mkdir -p "$BUILD_DIR/.local"
99115mv "$WORK_DIR/vendor/ghc-libs" "$BUILD_DIR/vendor"
100116mv "$WORK_DIR/.local/bin" "$BUILD_DIR/.local"
101117
118+speak "Caching .stack-work"
119+rsync -avq "$WORK_DIR/.stack-work/" "$SANDBOX_DIR"
120+cp -Rp "$WORK_DIR/.stack-work" "$BUILD_DIR"
121+
102122speak "Finished!"