Fix cabal.project, stack & s390x CI

composewell · Jun 20, 2022 · 6b50a63 · 6b50a63
1 parent 74ef7df
commit 6b50a63
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/s390x.yml b/.github/workflows/s390x.yml
@@ -28,9 +28,19 @@ jobs:
         install: |
           apt-get update -y
           apt-get install -y ghc libghc-quickcheck2-dev libghc-hspec-dev libghc-getopt-generics-dev libghc-split-dev curl
+        # [FIXME] Re-enable when `unicode-data` is released with QuickCheck properties
+        # run: |
+        #   ghc --version
+        #   curl -s -L https://hackage.haskell.org/package/unicode-data-0.3.0.tar.gz | tar xz
+        #   ghc --make -XMagicHash -XBangPatterns -XUnboxedTuples -itest:unicode-data-0.3.0/lib -o extras test/Extra.hs
+        #   ./extras
+        #   ghc --make -XMagicHash -XBangPatterns -XUnboxedTuples -itest:unicode-data-0.3.0/lib -o quickcheck test/Properties.hs
+        #   ./quickcheck
+        #   ghc --make -XMagicHash -XBangPatterns -XUnboxedTuples -itest:unicode-data-0.3.0/lib -o ucd test/NormalizationTest.hs
+        #   ./ucd
         run: |
           ghc --version
-          curl -s -L https://hackage.haskell.org/package/unicode-data-0.3.0.tar.gz | tar xz
+          curl -s -L https://github.com/composewell/unicode-data/archive/refs/heads/wip/quick_check.tar.gz | tar xz
           ghc --make -XMagicHash -XBangPatterns -XUnboxedTuples -itest:unicode-data-0.3.0/lib -o extras test/Extra.hs
           ./extras
           ghc --make -XMagicHash -XBangPatterns -XUnboxedTuples -itest:unicode-data-0.3.0/lib -o quickcheck test/Properties.hs

diff --git a/cabal.project b/cabal.project
@@ -2,4 +2,4 @@ packages: .
 source-repository-package
     type: git
     location: https://github.com/composewell/unicode-data.git
-    tag: d81b67cc76d7f312a35de8e2a42c8e856c393885
+    tag: 071085020e3934df59516b0fabc262c3cbe3e9d9
diff --git a/stack.yaml b/stack.yaml
@@ -2,9 +2,11 @@ packages:
 - '.'
 resolver: lts-18.18
 extra-deps:
-- unicode-data-0.2.0
+# [TODO] re-enable once unicode-data is released with quick check
+# - unicode-data-XXX
+- git: https://github.com/composewell/unicode-data.git
+  commit: 071085020e3934df59516b0fabc262c3cbe3e9d9
 - tasty-bench-0.3
-
 # Look at https://stackoverflow.com/questions/70045586/could-not-find-module-system-console-mintty-win32-when-compiling-test-framework
 flags:
   mintty: