Updated build script

MaybeJustJames · Jun 12, 2020 · ffdabf0 · ffdabf0
1 parent e79a715
commit ffdabf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,6 +41,7 @@ install:
 - ghcup set "8.6.5"
 - ghcup list
 - ghc --version
+  cabal update
 - cabal install purescript-0.13.8
 - npm install -g bower
 script:
@@ -62,5 +63,6 @@ deploy:
   overwrite: true
   draft: true
   on:
+    all_branches: true
     tags: true
     repo: coot/zephyr
diff --git a/bundle/build.sh b/bundle/build.sh
@@ -29,17 +29,16 @@ else
   BIN_EXT=""
 fi
 
-LOCAL_INSTALL_ROOT="dist-newstyle/build/${OS_NAME}/ghc-8.6.5/zephyr-0.2.2/x/zephyr/build/zephyr"
-ZEPHYR="${LOCAL_INSTALL_ROOT}/zephyr${BIN_EXT}"
-
 BUNDLE_DIR="bundle/zephyr"
 mkdir -p ${BUNDLE_DIR}
+cabal install --install-method=copy --installdir ${BUNDLE_DIR} exe:zephyr
+ZEPHYR="${BUNDLE_DIR}/zephyr${BIN_EXT}"
 
 # strip the executable
 if [[ ${OS_NAME} != "x86_64-windows" ]]; then
   strip ${ZEPHYR};
 fi
-cp ${ZEPHYR} README.md LICENSE ${BUNDLE_DIR};
+cp README.md LICENSE ${BUNDLE_DIR};
 
 # dependencies
 cabal info . > "${BUNDLE_DIR}/info"