diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 064a7bc..5243218 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,7 +26,7 @@ jobs: with: cabal-file: hspec-golden.cabal ubuntu-version: "latest" - macos-version: "13" + macos-version: "latest" version: 0.1.7.0 build-and-test: @@ -45,6 +45,12 @@ jobs: ghc-version: ${{ matrix.ghc }} cabal-version: "3.8" + - name: Install LLVM (macOS) + if: runner.os == 'macOS' + uses: KyleMayes/install-llvm-action@v2 + with: + version: "14" + - name: Update cabal run: cabal update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13204b4..7890365 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Release on: push: - branches: - - main + tags: + - 'v*' jobs: release: @@ -13,14 +13,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # Workaround for issue: https://github.com/cycjimmy/semantic-release-action/issues/159 - # Had to pin to version 14 - - name: "Pin node version" - uses: actions/setup-node@v2 - with: - node-version: '14' - - # Use haskell environment to run cabal configure needed for semantic-release-hackage - name: Setup Haskell id: setup-haskell-cabal uses: haskell-actions/setup@v2 @@ -28,17 +20,8 @@ jobs: ghc-version: "9.0" cabal-version: "3.8" - - name: Semantic Release - run: cabal configure --enable-tests + - name: Build source distribution + run: cabal sdist - - name: Semantic Release - uses: cycjimmy/semantic-release-action@v4 - with: - extra_plugins: | - @semantic-release/commit-analyzer - @semantic-release/release-notes-generator - @semantic-release/github - semantic-release-hackage@1.1.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - HACKAGE_TOKEN: ${{ secrets.HACKAGE_TOKEN }} + - name: Upload to Hackage + run: cabal upload --publish --username=stackbuilders --password=${{ secrets.HACKAGE_TOKEN }} dist-newstyle/sdist/*.tar.gz diff --git a/.releaserc b/.releaserc deleted file mode 100644 index 6b53f7c..0000000 --- a/.releaserc +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/semantic-release", - "branches": ["main", "chore-semantic-release"], - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - [ - "semantic-release-hackage", - { - "packageName": "hspec-golden", - "versionPrefix": "0.", - "publishDocumentation": false - } - ], - "@semantic-release/github" - ], - "tagFormat": "v0.${version}" -} diff --git a/hspec-golden.cabal b/hspec-golden.cabal index 44c1051..df5cec7 100644 --- a/hspec-golden.cabal +++ b/hspec-golden.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: hspec-golden -version: 0.0.0.0 +version: 0.2.2.0 synopsis: Golden tests for hspec description: . Golden tests store the expected output in a separated file. Each time a golden test diff --git a/package.yaml b/package.yaml index b3472f6..b86294f 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: hspec-golden -version: 0.0.0.0 # We use semantic-release to version this package +version: 0.2.2.0 github: "stackbuilders/hspec-golden" license: MIT author: "Stack Builders"