Skip to content

Commit 2776ace

Browse files
authored
Update MicroHs version (#1081)
MicroHs has pattern synonyms now. Also, update CI to use mcabal for building the package.
1 parent 06761b1 commit 2776ace

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

.github/workflows/mhs-ci.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,23 @@ jobs:
1515
with:
1616
path: cont
1717
- name: checkout mhs repo
18-
uses: actions/checkout@v4
19-
with:
20-
repository: augustss/MicroHs
21-
ref: stable-1
22-
path: mhs
23-
- name: make mhs
18+
# workaround for `act`: https://github.com/nektos/act/issues/678#issuecomment-1693751996
19+
run: git clone https://github.com/augustss/MicroHs.git --branch stable-5 mhs
20+
# uses: actions/checkout@v4
21+
# with:
22+
# repository: augustss/MicroHs
23+
# ref: stable-4
24+
# path: mhs
25+
- name: make and install mhs
2426
run: |
2527
cd mhs
26-
make
27-
# It's pretty ugly with the list of modules here, but I don't know a nice way of getting it from the cabal file.
28-
# I'll make it nicer with mcabal later.
29-
- name: compile containers package
28+
make minstall
29+
- name: compile and install containers package
3030
run: |
31-
cd mhs
32-
MHSCPPHS=./bin/cpphs ./bin/mhs -Pcontainers-test -ocontainers-test.pkg -i../cont/containers/src -XCPP -I../cont/containers/include Data.Containers.ListUtils Data.IntMap Data.IntMap.Lazy Data.IntMap.Strict Data.IntMap.Strict.Internal Data.IntMap.Internal Data.IntMap.Internal.Debug Data.IntMap.Merge.Lazy Data.IntMap.Merge.Strict Data.IntSet.Internal Data.IntSet.Internal.IntTreeCommons Data.IntSet Data.Map Data.Map.Lazy Data.Map.Merge.Lazy Data.Map.Strict.Internal Data.Map.Strict Data.Map.Merge.Strict Data.Map.Internal Data.Map.Internal.Debug Data.Set.Internal Data.Set Data.Graph Data.Sequence Data.Sequence.Internal Data.Sequence.Internal.Sorting Data.Tree Utils.Containers.Internal.BitUtil Utils.Containers.Internal.BitQueue Utils.Containers.Internal.StrictPair
31+
PATH="$HOME/.mcabal/bin:$PATH"
32+
cd cont/containers
33+
mcabal install
34+
- name: cleanup
35+
run: |
36+
rm -rf $HOME/.mcabal
37+

containers/include/containers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "MachDeps.h"
1313
#endif
1414

15-
#ifdef __GLASGOW_HASKELL__
15+
#if defined(__GLASGOW_HASKELL__) || defined(__MHS__)
1616
#define DEFINE_PATTERN_SYNONYMS 1
1717
#endif
1818

0 commit comments

Comments
 (0)