ci: Update build with llvm-12

madlib-lang · Jun 9, 2023 · 9028717 · 9028717
1 parent 4a9e77e
commit 9028717
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,8 @@ jobs:
 
       - run: sudo apt-get update -y
 
-      - run: sudo apt-get install -y lcov llvm-9 nasm
+      # TODO: remove llvm-9
+      - run: sudo apt-get install -y lcov llvm-12 nasm
       # - run: DEBIAN_FRONTEND=noninteractive sudo apt-get install -y curl llvm-9 zip wget automake libtool clang gcc-9 g++-9 libstdc++-9-dev libc++abi-9-dev unzip musl-tools cmake git nasm libssl-dev
       # - run: sudo apt-get install -y build-essential curl libffi-dev libffi7 libgmp-dev libgmp10 libncurses-dev libncurses5 libtinfo5
 
@@ -37,7 +38,7 @@ jobs:
         run: TARGET="LINUX_X64" ./scripts/build-runtime-libs
 
       - name: build runtime
-        run: AR="llvm-ar-9" TARGET="LINUX_X64" CPLUS_INCLUDE_PATH="/usr/include/c++/9:/usr/include/x86_64-linux-gnu/c++/9:/usr/include/" ./scripts/build-runtime
+        run: AR="llvm-ar-12" TARGET="LINUX_X64" CPLUS_INCLUDE_PATH="/usr/include/c++/9:/usr/include/x86_64-linux-gnu/c++/9:/usr/include/" ./scripts/build-runtime
 
       - run: ./scripts/test coverage
 

diff --git a/stack.yaml b/stack.yaml
@@ -112,14 +112,14 @@ extra-deps:
 - unliftio-core-0.2.0.1@sha256:f9abcdd3f3d28e4840563efb7b8760d2de9b5707bcd6f53a87f6a0d77bb5a9f7,1082
 - split-0.2.3.4@sha256:a6df9c3e806ee7cb50bc980a183fc1156f35022a39430dabac0bf9456fe18a4b,2647
 - vector-algorithms-0.8.0.4@sha256:bf4760b23a0fee09abb8c9e3c952c870f5dc9780876e9d7e38ab2bdd98c8f283,3752
-# - llvm-hs-pretty-0.9.0.0@sha256:b7a5de5f3dd97893d19d2b47af1e4dd8d075a5cf57062180a912d1f3ef1def60,1671
-# - git: https://github.com/llvm-hs/llvm-hs
-#   commit: 423220bffac4990d019fc088c46c5f25310d5a33  # llvm-9, with Setup.hs fix
-#   subdirs:
-#     - llvm-hs-pure
-#     - llvm-hs
-- ../llvm-hs/llvm-hs-pure
-- ../llvm-hs/llvm-hs
+- git: https://github.com/madlib-lang/llvm-hs
+  commit: 6239fb9715bb9169524e3e7d43682db21e495224  # llvm-12, with Setup.hs fix for DILocalVariable and DICompileUnit
+  subdirs:
+    - llvm-hs-pure
+    - llvm-hs
+# for local development
+# - ../llvm-hs/llvm-hs-pure
+# - ../llvm-hs/llvm-hs
 - git: https://github.com/llvm-hs/llvm-hs-pretty
   commit: 655ff4d47b3a584b4c9a5863f6121b954825920c
 - rock-0.3.1.1@sha256:78ea97956e6db9a8913e420111c2b5bcc5e52122ab56bfd9958606f0857aa25c,3591

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -697,6 +697,32 @@ packages:
       sha256: 850a7481c87750751d87369690e3bacbdf986716b338ecadb3eeb1af5b192049
   original:
     hackage: vector-algorithms-0.8.0.4@sha256:bf4760b23a0fee09abb8c9e3c952c870f5dc9780876e9d7e38ab2bdd98c8f283,3752
+- completed:
+    subdir: llvm-hs-pure
+    name: llvm-hs-pure
+    version: 12.0.0
+    git: https://github.com/madlib-lang/llvm-hs
+    pantry-tree:
+      size: 2712
+      sha256: 776ab96f99ac27ee50b4492a33be8459c39c87614d1568d36824b95506e31600
+    commit: 6239fb9715bb9169524e3e7d43682db21e495224
+  original:
+    subdir: llvm-hs-pure
+    git: https://github.com/madlib-lang/llvm-hs
+    commit: 6239fb9715bb9169524e3e7d43682db21e495224
+- completed:
+    subdir: llvm-hs
+    name: llvm-hs
+    version: 12.0.0
+    git: https://github.com/madlib-lang/llvm-hs
+    pantry-tree:
+      size: 12781
+      sha256: ba7251e6f3d2d01db77dde69895c9b3a1edcefd4b2285de0b054e947bc632ca1
+    commit: 6239fb9715bb9169524e3e7d43682db21e495224
+  original:
+    subdir: llvm-hs
+    git: https://github.com/madlib-lang/llvm-hs
+    commit: 6239fb9715bb9169524e3e7d43682db21e495224
 - completed:
     name: llvm-hs-pretty
     version: 12.0.0