From cf9ca245e03e4e56f192fb68f7e4654957325642 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Mon, 25 Jan 2021 16:25:28 -0800
Subject: [PATCH 1/6] Allow MacOS builds to fail (temporarily)

---
 .github/workflows/crux-llvm-build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
index 8dff425a9..64fbbc3d2 100644
--- a/.github/workflows/crux-llvm-build.yml
+++ b/.github/workflows/crux-llvm-build.yml
@@ -24,11 +24,16 @@ 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]
         ghc: ["8.6.5", "8.8.4", "8.10.2"]
+        allow-failure: [false]
+        include:
+          - os: macos-latest
+            allow-failure: [true]
         # Windows only seems to work on 8.6.5. Others result in
         # segfaults or other internal errors.
         exclude:

From 448619335461482e09fea74c25a7f650539661aa Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Mon, 25 Jan 2021 17:36:11 -0800
Subject: [PATCH 2/6] [crux-llvm] Fix allow-failure override for github
 actions.

---
 .github/workflows/crux-llvm-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
index 64fbbc3d2..be7dd1998 100644
--- a/.github/workflows/crux-llvm-build.yml
+++ b/.github/workflows/crux-llvm-build.yml
@@ -33,7 +33,7 @@ jobs:
         allow-failure: [false]
         include:
           - os: macos-latest
-            allow-failure: [true]
+            allow-failure: true
         # Windows only seems to work on 8.6.5. Others result in
         # segfaults or other internal errors.
         exclude:

From 54e800482ac1aab0b2971470d2f1db2f6976c3cb Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Mon, 25 Jan 2021 22:00:13 -0800
Subject: [PATCH 3/6] [crux-llvm] report clang and llvm-link version in github
 actions.

---
 .github/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ci.sh b/.github/ci.sh
index 788972a66..202566b20 100755
--- 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 "$@"
 }
 

From e8a770376d6a265fa9a898a727aa2dae5705a506 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Mon, 25 Jan 2021 22:44:34 -0800
Subject: [PATCH 4/6] Update llvm-pretty and llvm-pretty-bc-parser for LLVM 11
 and 12 support.

---
 dependencies/llvm-pretty           | 2 +-
 dependencies/llvm-pretty-bc-parser | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies/llvm-pretty b/dependencies/llvm-pretty
index cf5c93106..f5e0ff3f3 160000
--- a/dependencies/llvm-pretty
+++ b/dependencies/llvm-pretty
@@ -1 +1 @@
-Subproject commit cf5c931061b48a4253e7eea15947eff7d9790f07
+Subproject commit f5e0ff3f3f6154842d3321031ca5a5031c91ecc6
diff --git a/dependencies/llvm-pretty-bc-parser b/dependencies/llvm-pretty-bc-parser
index 3d0d54948..c38b86b8b 160000
--- a/dependencies/llvm-pretty-bc-parser
+++ b/dependencies/llvm-pretty-bc-parser
@@ -1 +1 @@
-Subproject commit 3d0d549486ceb101c38af3423426f3ff07aa966d
+Subproject commit c38b86b8b485c85181ab1bfc682fae194c8d4027

From e6d0a90f8496228c4fbba4aec2cd4abcf8319a61 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Mon, 25 Jan 2021 23:08:37 -0800
Subject: [PATCH 5/6] Skip CLANG and LLVM_LINK version display if not set in
 github actions.

---
 .github/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ci.sh b/.github/ci.sh
index 202566b20..78c21d14a 100755
--- a/.github/ci.sh
+++ b/.github/ci.sh
@@ -114,8 +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
+  ${CLANG:-:} --version
+  ${LLVM_LINK:-:} --version
   cabal v2-test "$@"
 }
 

From 60db1f660c231fd0c0f2da9d4e846aa09a6a6b71 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Tue, 26 Jan 2021 18:41:54 -0800
Subject: [PATCH 6/6] Update allowed-failure for MacOS github actions.

---
 .github/workflows/crux-llvm-build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
index be7dd1998..e9ebccefa 100644
--- a/.github/workflows/crux-llvm-build.yml
+++ b/.github/workflows/crux-llvm-build.yml
@@ -28,11 +28,18 @@ jobs:
     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.