Skip to content

Commit 5528bb7

Browse files
committed
Make workflow mandatory, fix build issues
1 parent 7a0a923 commit 5528bb7

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

.github/workflows/haskell.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Haskell CI
22

33
on:
4+
merge_group:
45
pull_request:
56
push:
67
# we need this to populate cache for `main` branch to make it available to the child branches, see
@@ -140,7 +141,22 @@ jobs:
140141
KEEP_WORKSPACE: 1
141142
run: cabal test all --enable-tests --test-show-details=direct
142143

143-
check:
144+
build-successful:
145+
needs: [build]
146+
if: ${{ always() }}
147+
runs-on: ubuntu-latest
148+
steps:
149+
- name: Check if any previous job failed
150+
run: |
151+
if [[ "${{ needs.build.result }}" == "failure" ]]; then
152+
# this ignores skipped dependencies
153+
echo 'Required jobs failed to build.'
154+
exit 1
155+
else
156+
echo 'Build complete'
157+
fi
158+
159+
make-tag:
144160
needs: build
145161
runs-on: ubuntu-latest
146162
outputs:
@@ -185,10 +201,10 @@ jobs:
185201
186202
187203
release:
188-
needs: [build, check]
204+
needs: [build-successful, make-tag]
189205
runs-on: ubuntu-latest
190206

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

193209
outputs:
194210
upload_url: ${{ steps.create_release.outputs.upload_url }}
@@ -249,8 +265,9 @@ jobs:
249265
id: create_release
250266
uses: softprops/action-gh-release@v2
251267
with:
252-
tag_name: ${{ needs.check.outputs.tag != '' && needs.check.outputs.tag || github.ref_name }}
253-
name: Release ${{ needs.check.outputs.tag != '' && needs.check.outputs.tag || github.ref_name }}
268+
tag_name: ${{ needs.make-tag.outputs.tag != '' && needs.make-tag.outputs.tag || github.ref_name }}
269+
name: Release ${{ needs.make-tag.outputs.tag != '' && needs.make-tag.outputs.tag || github.ref_name }}
254270
body_path: changelog.txt
255271
draft: false
256272
prerelease: false
273+

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to the [Package Versioning Policy (PVP)](https://pvp.haskell.org/).
77

88
## [Unreleased]
9+
- Updated dependency on tar > 0.7
910

1011
## [0.10.0.0] - 2025-09-09
1112

@@ -361,4 +362,4 @@ and this project adheres to the [Package Versioning Policy (PVP)](https://pvp.ha
361362
[0.4.4.1]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.4.0...v0.4.4.1
362363
[0.4.4.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.3.0...v0.4.4.0
363364
[0.4.3.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.4.2.0...v0.4.3.0
364-
[0.4.2.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.3.0.2...v0.4.2.0
365+
[0.4.2.0]: https://github.com/input-output-hk/hedgehog-extras/compare/v0.3.0.2...v0.4.2.0

src/Hedgehog/Extras/Internal/Win32/NamedPipes.hsc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import Data.Function (($))
2323
import Data.String (String)
2424
import Foreign.C.String (withCString)
2525
import System.IO (IO)
26-
import System.Win32.File
2726
import System.Win32.Types hiding (try)
2827

2928
-- | Timeout in milliseconds.

0 commit comments

Comments
 (0)