diff --git a/.travis.yml b/.travis.yml index 2532791e0..925e8cbd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,17 +125,17 @@ before_deploy: sed -e "s/NPM_VERSION/$(./scripts/get-npm-version)/g" -i "" npm/package.json ; sed -e "s/PACKAGE_VERSION/$(./scripts/get-version)/g" -i "" npm/install.js ; else - # We first build the dynamic version - docker run --mount src="$(pwd)",target=/home/ubuntu/spago,type=bind "nilrecurring/haskell-lavello:${IMAGE_TAG}" /bin/bash -c "cd spago; stack build --copy-bins --local-bin-path ./artifacts" - cp artifacts/spago spago - tar -zcvf "${TRAVIS_OS_NAME}.tar.gz" spago - # Then the static one + # We first build the static version docker run --mount src="$(pwd)",target=/home/ubuntu/spago,type=bind "nilrecurring/haskell-lavello:${IMAGE_TAG}" /bin/bash -c "cd spago; stack build --copy-bins --flag spago:static --local-bin-path ./artifacts" + cp artifacts/spago spago + tar -zcvf "${TRAVIS_OS_NAME}-static.tar.gz" spago + # Then the dynamic one + docker run --mount src="$(pwd)",target=/home/ubuntu/spago,type=bind "nilrecurring/haskell-lavello:${IMAGE_TAG}" /bin/bash -c "cd spago; stack build --copy-bins --local-bin-path ./artifacts" sed -e "s/NPM_VERSION/$(./scripts/get-npm-version)/g" -i npm/package.json ; sed -e "s/PACKAGE_VERSION/$(./scripts/get-version)/g" -i npm/install.js ; fi cp artifacts/spago spago - tar -zcvf "${TRAVIS_OS_NAME}-static.tar.gz" spago + tar -zcvf "${TRAVIS_OS_NAME}.tar.gz" spago for f in *.tar.gz; do mv "$f" uploads/; done ## Get ready to publish npm diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a72eb18..fc0180e85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.12.1] - 2019-11-17 + +Bugfixes: +- Fix macOS release artifact (#503, #504) +- Complete parser implementation for module declarations, for `spago test` (#499) + +Other improvements: +- Docs: fix typo in README (#498) +- Errors: use `logWarn` for all warnings (#501) + ## [0.12.0] - 2019-11-15 Breaking changes (😱!!!): diff --git a/package.yaml b/package.yaml index d1bbd1bbd..9df622f14 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: spago -version: 0.12.0.0 +version: 0.12.1.0 github: "spacchetti/spago" license: BSD3 author: "Justin Woo, Fabrizio Ferrai"