diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-11-01 20:12:37 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-11-01 20:12:37 -0700 |
| commit | dd0c17ac6c5c34b09b4e79a0fa753745bacfe122 (patch) | |
| tree | 0d8bf06c82c718504b1398471d9adbbd7dd45aa1 /.circleci | |
| parent | 15eafc587c41e041194d1c4c84b2b94410a06756 (diff) | |
| parent | b67a6ae12f8107b2d1714659f8a121274d5833f9 (diff) | |
| download | stylish-haskell-dd0c17ac6c5c34b09b4e79a0fa753745bacfe122.tar.gz | |
Merge tag 'v0.9.4.3'
v0.9.4.3
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rwxr-xr-x | .circleci/release.sh | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e6a538c..e1e9020 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,17 +12,17 @@ workflows: jobs: build: docker: - - image: 'fpco/stack-build:latest' + - image: 'haskell:8.6' steps: - checkout - restore_cache: - key: 'v2-stylish-haskell-{{ arch }}-{{ .Branch }}' + key: 'v3-stylish-haskell-{{ arch }}-{{ .Branch }}' - run: name: 'Build, install and test' command: 'stack build --test --copy-bins --jobs=1' - save_cache: - key: 'v2-stylish-haskell-{{ arch }}-{{ .Branch }}-{{ .Revision }}' + key: 'v3-stylish-haskell-{{ arch }}-{{ .Branch }}-{{ .Revision }}' paths: - '~/.stack-work' - '~/.stack' diff --git a/.circleci/release.sh b/.circleci/release.sh index 5586d24..a55247f 100755 --- a/.circleci/release.sh +++ b/.circleci/release.sh @@ -19,14 +19,15 @@ if [[ -z "$TAG" ]]; then fi # Install ghr -GHR_VERSION="v0.5.4" -wget --quiet \ - "https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_386.zip" -unzip ghr_${GHR_VERSION}_linux_386.zip +GHR_VERSION="v0.13.0" +curl --silent -L -O \ + "https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_386.tar.gz" +tar xf ghr_${GHR_VERSION}_linux_386.tar.gz +mv ghr_${GHR_VERSION}_linux_386/ghr . # Install upx UPX_VERSION="3.94" -wget --quiet \ +curl --silent -L -O \ "https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz" tar xf upx-${UPX_VERSION}-amd64_linux.tar.xz mv upx-${UPX_VERSION}-amd64_linux/upx . |