Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Haskell CI

on:
merge_group:
pull_request:
push:
# we need this to populate cache for `main` branch to make it available to the child branches, see
Expand Down Expand Up @@ -140,15 +141,30 @@ jobs:
KEEP_WORKSPACE: 1
run: cabal test all --enable-tests --test-show-details=direct

check:
needs: build
build-successful:
needs: [build]
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
- name: Check if any previous job failed
run: |
if [[ "${{ needs.build.result }}" == "failure" ]]; then
# this ignores skipped dependencies
echo 'Required jobs failed to build.'
exit 1
else
echo 'Build complete'
fi

make-tag:
needs: build-successful
if: ${{ github.ref == 'refs/heads/main' }}
runs-on: ubuntu-latest
outputs:
tag: ${{ steps.tag.outputs.tag }}

steps:
- uses: actions/checkout@v3

- name: Check if cabal project is sane
run: |
PROJECT_DIR="$PWD"
Expand All @@ -160,7 +176,6 @@ jobs:

- name: Tag new version
id: tag
if: ${{ github.ref == 'refs/heads/main' }}
run: |
package_version="$(cat *.cabal | grep '^version:' | cut -d : -f 2 | xargs)"

Expand All @@ -176,19 +191,22 @@ jobs:

echo "::set-output name=tag::v$package_version"
fi
else
echo "Tag v$package_version already exists. Not making new git tag."
fi

- name: Show tag
- name: Show new tag
if: steps.tag.outputs.tag != ''
run: |
echo "Ref: ${{ github.ref }}"
echo "Tag: ${{ steps.tag.outputs.tag }}"


release:
needs: [build, check]
needs: [make-tag]
runs-on: ubuntu-latest

if: ${{ needs.check.outputs.tag != '' || startsWith(github.ref, 'refs/tags/v') }}
if: ${{ needs.make-tag.outputs.tag != '' || startsWith(github.ref, 'refs/tags/v') }}

outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
Expand Down Expand Up @@ -249,8 +267,9 @@ jobs:
id: create_release
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ needs.check.outputs.tag != '' && needs.check.outputs.tag || github.ref_name }}
name: Release ${{ needs.check.outputs.tag != '' && needs.check.outputs.tag || github.ref_name }}
tag_name: ${{ needs.make-tag.outputs.tag != '' && needs.make-tag.outputs.tag || github.ref_name }}
name: Release ${{ needs.make-tag.outputs.tag != '' && needs.make-tag.outputs.tag || github.ref_name }}
body_path: changelog.txt
draft: false
prerelease: false

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to the [Package Versioning Policy (PVP)](https://pvp.haskell.org/).

## [Unreleased]
- Updated dependency on tar ^>= 0.7

## [0.10.0.0] - 2025-09-09

Expand Down Expand Up @@ -361,4 +362,4 @@ and this project adheres to the [Package Versioning Policy (PVP)](https://pvp.ha
[0.4.4.1]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.4.0...v0.4.4.1
[0.4.4.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.3.0...v0.4.4.0
[0.4.3.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.2.0...v0.4.3.0
[0.4.2.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.3.0.2...v0.4.2.0
[0.4.2.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.3.0.2...v0.4.2.0
3 changes: 2 additions & 1 deletion hedgehog-extras.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ license: Apache-2.0
license-files: LICENSE
NOTICE
build-type: Simple

extra-doc-files: CHANGELOG.md
README.md
source-repository head
type: git
location: https://github.com/input-output-hk/hedgehog-extras
Expand Down
1 change: 0 additions & 1 deletion src/Hedgehog/Extras/Internal/Win32/NamedPipes.hsc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import Data.Function (($))
import Data.String (String)
import Foreign.C.String (withCString)
import System.IO (IO)
import System.Win32.File
import System.Win32.Types hiding (try)

-- | Timeout in milliseconds.
Expand Down
Loading