diff --git a/.travis.yml b/.travis.yml index 852da6c..6c84c70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,7 @@ install: - cabal install purescript-0.13.6 - npm install -g bower script: +- cp cabal.project.ci cabal.project.local - cabal build exe:zephyr - cabal run -f test-with-cabal zephyr-test -- -m generators -m dceEval -m dceExpr -m TestLib before_deploy: @@ -48,7 +49,7 @@ before_deploy: deploy: provider: releases api_key: - secure: QtwaWKRaMpFepbLXokFrLq7dCjOfMVyZvZdZKIj4AChETPpI/5UYwW9VUoiVlSmM9kt+vrCR/ijsn0sLDrT+irE0LXyuZSPxrahZeQgiL5g6EKy1zJhUQQTjXbd8q0zn8fnqkJ5pfDHhwb4JvxYIo3ZyCIS8ipL2fR9YVU4aBHgodzd5jYx9J9IRinDqTmcr2jqHNs19heg5S3Gka5YtwipdfFxDLvnZqNvUUnCaK0Ohis8FEEwr4bCSVLGrvhsht+ceCDAk2wUDrYgYQsIBfixJyoXTRpv36ANEj8ImFbv4HAzXcaP/Z815uuwlAbNH2nhSqX0Ng3tGHpwwut1g2d5K7psHi1J6o++QdTk/I+ep8buKxplnyo5/3b0rh24BC2VIBXDcVpSz+fWvYG/GtBm1fGerqYCr5g5Q5YnXTfY4d0ARBHUmB+F8vK2UfafLROFrDpI2xjrYiQAfS0++FJA5m15EKMEUcI1mXBSEtqmc5mumhWXI6FN4tmc2G644o9Pq2rcrJKt2TjZ/823AOGQZER1OOXatYLB7j6M3v5ZLMI3nYWCGmP51qpdNQjtmmhRcqKqI/9fjA7S9j6pYCRd4V/6KsS8ArNa4G4HOGSM/fMPN/6REREk/a1SlDF++ZIZGoXVj+FgePzsYDptDKTDdulb3UmmnS0J33Jfwm9s= + secure: Yo9E4uBAgSAtsAj4CZ+hraiYdSbbeavNfcfcdUxapvB/fAsCs9sD2iNbqHfGwYppJKvnrYJZo62UsMskodSuqLhFnn6VH5k38N1xC3LY0VFQNvDwj4qf6WZ7Mig3m25xVElVmO7IVRRwThq837c10n8GOxvmfxMp+VDI5E7j3qkCLmtKAB0swtTWRQsRRiW0AqKZeAhZ8HINCNNwF65Q7/Vw1Gcm17J0ABh+pTVfJ+tO595JsA6W5+PrVnlcKDM+fuwT+EQ1BxhxKJORV+0lnDKG8KZ8PFkEF9xPW+erOXwTpA1E8SdnU5bucdOP128WR1Gy707pmoR4W16Nwo0fVC2yzxMxTKqdyqPCLBk4o09UYmp7urdplHVg8XXE2ulYqpkK7MQ47TpOJBwGA1zqQoyVJG4QgrPhyj1f1AxLVLXPIgB8MeoMO0nIShLkCJwTHAgTW8ca++TlSXvk/UuW9sbRBSwZJYqbUH2a4OTx3bDDjfhuhGU1nwCUlGA4TbQ/T6ae1uN3tjhUN1Z1RJCWi5u03ptwRu0yyWTmDzcUYAQn7X3cV5sXcPQTHJE6tV5c0SAfkEMI+lEFIRoE5I0SaeEHJN7Ez+AlA4eUnOxBCRed/90MqXLI9aLZMtNvpfnLJoaki5IThxgdrvHmj38eAOgPiBhD0a2HMZKuWNpqhZI= file_glob: true file: - bundle/*.tar.gz diff --git a/appveyor.yml b/appveyor.yml index 1e13d56..0de3467 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,11 +21,10 @@ install: - cabal --version - cabal update -v build_script: - - ps: | - # TODO: enable -Werror - cabal build exe:zephyr - cabal build -f test-with-cabal zephyr-test - - ps: bash bundle/build.sh win64 + - cp cabal.project.ci cabal.project.local + - cabal build exe:zephyr + - cabal build -f test-with-cabal zephyr-test + - bash bundle/build.sh win64 test_script: # TODO: not testing `-m TestLib` - cabal run -f test-with-cabal zephyr-test -- -m generators -m dceEval -m dceExpr @@ -37,8 +36,8 @@ artifacts: deploy: - provider: GitHub auth_token: - secure: gHIxz3scq98LOgduo20IiKNFcLOmcKHHKH0qI4/z4TawrmbR+MV/rb1mG9GCXf7M - artifact: x86-64-windows.tar.gz,x86-64-windows.sha + secure: x7NfETL6i3LCuKpv9WZf4k/RmnZTr5glvheuBbl7FvFhtqDhc4YynBufhbjYKgLC + artifact: x86_64-windows.tar.gz,x86_64-windows.sha draft: true force_update: true on: diff --git a/bundle/build.sh b/bundle/build.sh index 3a3a12a..a59ae54 100755 --- a/bundle/build.sh +++ b/bundle/build.sh @@ -15,7 +15,7 @@ case $1 in "linux") OS_NAME="x86_64-linux";; "osx") - OS_NAME="x86_64-darwin";; + OS_NAME="x86_64-osx";; "win64") OS_NAME="x86_64-windows";; *) diff --git a/cabal.project.ci b/cabal.project.ci new file mode 100644 index 0000000..7e76397 --- /dev/null +++ b/cabal.project.ci @@ -0,0 +1,3 @@ +package zephyr + ghc-options: -Werror +