Merge pull request #624 from GaloisInc/cruxllvm-mac

Update to include support for LLVM versions 11 and 12.
GaloisInc · Jan 28, 2021 · 119c6ec · 119c6ec
2 parents 0953264 + 60db1f6
commit 119c6ec
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/ci.sh b/.github/ci.sh
@@ -114,6 +114,8 @@ build() {
 test() {
   # System-agnostic path
   export PATH="$PATH:/usr/local/opt/llvm/bin:/c/Program Files/LLVM/bin"
+  ${CLANG:-:} --version
+  ${LLVM_LINK:-:} --version
   cabal v2-test "$@"
 }
 

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
@@ -24,11 +24,23 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     needs: [outputs]
+    continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] # , windows-latest]
+        os: [ubuntu-latest] # , macos-latest] # , windows-latest]
         ghc: ["8.6.5", "8.8.4", "8.10.2"]
+        allow-failure: [false]
+        include:
+          - os: macos-latest
+            ghc: 8.6.5
+            allow-failure: true
+          - os: macos-latest
+            ghc: 8.8.4
+            allow-failure: true
+          - os: macos-latest
+            ghc: 8.10.2
+            allow-failure: true
         # Windows only seems to work on 8.6.5. Others result in
         # segfaults or other internal errors.
         exclude:

diff --git a/dependencies/llvm-pretty b/dependencies/llvm-pretty
diff --git a/dependencies/llvm-pretty-bc-parser b/dependencies/llvm-pretty-bc-parser