From 5fdc01925e80245342c54ca5ba75515145bc488d Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Fri, 30 Jul 2021 18:17:38 +0200 Subject: [PATCH] Re-enable GHA dhall build on Windows (#2271) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …but keep the problematic doctests disabled. This reverts commit 06dac3d229073779f4594e6d96feb8bf016c69b5. Context: #2237 --- .github/workflows/main.yml | 10 ---------- dhall/dhall.cabal | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ce25124dd..5c3272f11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,16 +74,6 @@ jobs: name: dhall-nix assets: > bin/dhall-to-nix - # Temporarily exclude dhall on Windows due to - # https://github.com/dhall-lang/dhall-haskell/issues/2237 - - os: - runner: windows-latest - package: windows - package: - name: dhall - assets: > - bin/dhall - share/man/man1/dhall.1 fail-fast: false name: ${{ matrix.package.name }} on ${{ matrix.os.runner }} runs-on: ${{ matrix.os.runner }} diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index b96ca5095..93fa77509 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -711,6 +711,9 @@ Test-Suite doctest filepath < 1.5 , mockery < 0.4 , doctest >= 0.7.0 && < 0.19 + if os(windows) + -- https://github.com/dhall-lang/dhall-haskell/issues/2237 + Buildable: False Default-Language: Haskell2010 Benchmark dhall-parser