diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9dda8e3f..c660c8fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v4 - name: Install rdkafka run: sudo apt-get install --assume-yes --no-install-recommends librdkafka-dev - - uses: freckle/stack-action@v4 + - uses: freckle/stack-action@v5 with: stack-yaml: ${{ matrix.stack-yaml }} env: @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: haskell/actions/hlint-setup@v2 - - uses: haskell/actions/hlint-run@v2 + - uses: haskell-actions/hlint-setup@v2 + - uses: haskell-actions/hlint-run@v2 with: fail-on: warning diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1dc0799..4d707b6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,17 +5,29 @@ on: branches: main jobs: - release: + tag: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - + - uses: actions/checkout@v4 - id: tag uses: freckle/haskell-tag-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + outputs: + tag: ${{ steps.tag.outputs.tag }} + + release: + needs: tag + if: needs.tag.outputs.tag + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: sudo apt-get install --assume-yes --no-install-recommends librdkafka-dev + - uses: freckle/stack-action@v5 + with: + test: false + stack-build-arguments: --haddock --haddock-for-hackage - - if: steps.tag.outputs.tag - uses: freckle/stack-upload-action@v2 + - run: | + stack --stack-yaml stack-lts-18.28.yaml upload --pvp-bounds lower . + stack upload --documentation . env: - HACKAGE_API_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }} + HACKAGE_KEY: ${{ secrets.HACKAGE_UPLOAD_API_KEY }} diff --git a/docs/upload b/docs/upload deleted file mode 100755 index 350210c5..00000000 --- a/docs/upload +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# -# NOTE: even though this project is typically developed with Stack, this script -# uses cabal (because cabal-haddock can do things that stack-haddock cannot). If -# you don't have a non-Stack Haskell tool-chain installed of the appropriate -# version (ghc >= 9.4), we recommend using nix: -# -# % {install/configure nix} -# % nix develop --command docs/upload -# -set -euo pipefail - -rm ./dist-newstyle/*-docs.tar.gz - -cabal update - -cabal build - -cabal haddock \ - --haddock-for-hackage \ - --haddock-hyperlink-source \ - --haddock-quickjump - -cabal upload \ - --publish \ - --documentation ./dist-newstyle/*-docs.tar.gz