Skip to content

Commit

Permalink
re-enable windows (disabled since move to 'get-tested')
Browse files Browse the repository at this point in the history
  • Loading branch information
shayne-fletcher committed Mar 29, 2024
1 parent c1b2cd2 commit 3085707
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: haskell ci
on:
on:
push:
pull_request:
workflow_dispatch:
jobs:
generate-matrix:
name: "Generate matrix from cabal"
outputs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
runs-on: ubuntu-latest
steps:
Expand All @@ -17,6 +17,7 @@ jobs:
cabal-file: placeholder.cabal
ubuntu-version: latest
macos-version: latest
windows-version: latest
version: 0.1.7.0
tests:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
Expand All @@ -25,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
steps:
steps:
- uses: actions/checkout@v4
- uses: haskell-actions/setup@v2
id: setup-haskell
Expand Down
1 change: 1 addition & 0 deletions placeholder.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ common test
import: base
hs-source-dirs: t
build-depends:
filepath >= 1.4,
placeholder,
tasty >= 1.2,
tasty-hunit >= 0.10.0
Expand Down
7 changes: 4 additions & 3 deletions t/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Control.Exception
import Control.Monad (when)
import Control.Placeholder
import Data.List
import System.FilePath((</>))
import Test.Tasty
import Test.Tasty.HUnit

Expand Down Expand Up @@ -32,13 +33,13 @@ todoTest = do
assertBool ("unexpected HasCallStack format: " ++ msg) $
all has [
"CallStack (from HasCallStack):"
, "todo, called at t/Test.hs:27:47 in main:Main"
, "todo, called at t" </> "Test.hs:28:47 in main:Main"
]
when (has "CallStack (from -prof)") $ --enable-profiling enabled
assertBool ("unexpected -prof stack format: " ++ msg) $
all has [
"Control.Placeholder.todo (src/Control/Placeholder.hs:116:1-66)"
, "Main.todoTest (t/Test.hs:(26,1)-(43,7))"
"Control.Placeholder.todo (src" </> "Control" </> "Placeholder.hs:116:1-66)"
, "Main.todoTest (t" </> "Test.hs:(27,1)-(44,7))"
, "Main.CAF (<entire-module>)"
]

Expand Down

0 comments on commit 3085707

Please sign in to comment.