From 8851aad8374059b06c54b1f06f69e92098b2bef1 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 28 Jul 2021 18:32:55 +0900 Subject: [PATCH 1/2] ci: Fix .github/workflows/upload-binaries.yml --- .github/workflows/upload-binaries.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upload-binaries.yml b/.github/workflows/upload-binaries.yml index 3c81a006..8882fe66 100644 --- a/.github/workflows/upload-binaries.yml +++ b/.github/workflows/upload-binaries.yml @@ -34,18 +34,24 @@ jobs: run: stack --system-ghc build --ghc-options=-Werror - name: Set extension to .exe on Windows - run: echo "::set-env name=EXT::.exe" - if: matrix.os == 'windows-latest' + id: get_ext + run: | + if [ ${{ matrix.os }} == windows-latest ]; then + ext=.exe + fi + echo "::set-output name=ext::$ext" + shell: bash - name: Get binary path + id: get_binary_path run: | - echo "::set-env name=BINARY_PATH::$(stack --system-ghc path --local-install-root)/bin/jikka${{ env.EXT }}" + echo "::set-output name=binary_path::$(stack --system-ghc path --local-install-root)/bin/jikka${{ steps.get_ext.outputs.ext }}" shell: bash - name: Compress binary uses: svenstaro/upx-action@2.0.1 with: - file: ${{ env.BINARY_PATH }} + file: ${{ steps.get_binary_path.outputs.binary_path }} - name: Upload Release Asset uses: actions/upload-release-asset@v1.0.1 @@ -53,6 +59,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: ${{ env.BINARY_PATH }} - asset_name: jikka-${{ github.event.release.tag_name }}-${{ runner.os }}${{ env.EXT }} + asset_path: ${{ steps.get_binary_path.outputs.binary_path }} + asset_name: jikka-${{ github.event.release.tag_name }}-${{ runner.os }}${{ steps.get_ext.outputs.ext }} asset_content_type: application/octet-stream From f9afe0aeb7b2ec458e0a9e376e8ee3347b49b515 Mon Sep 17 00:00:00 2001 From: Kimiyuki Onaka Date: Wed, 28 Jul 2021 18:34:29 +0900 Subject: [PATCH 2/2] docs: Update documents about Hackage --- CHANGELOG.md | 2 +- README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b77b9915..0a672bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 2021-07-28: v5.0.11.1 -Uploaded to Hackage +Uploaded to Hackage: ## 2021-07-21: v5.0.11.0 diff --git a/README.md b/README.md index 66fd964b..267c557a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,8 @@ for developpers: - [CONTRIBUTING.ja.md](https://github.com/kmyk/Jikka/blob/master/CONTRIBUTING.ja.md) (Japanese translation) - [docs/DESIGN.md](https://github.com/kmyk/Jikka/blob/master/docs/DESIGN.md) (Japanese) - [docs/how-it-works.pdf](https://github.com/kmyk/Jikka/blob/master/docs/how-it-works.pdf) (Japanese) -- [Haddock](https://kmyk.github.io/Jikka/) +- [Haddock](https://hackage.haskell.org/package/Jikka) + - [Haddock (master)](https://kmyk.github.io/Jikka/) ## Examples