diff --git a/.github/ci.sh b/.github/ci.sh index 788972a66..78c21d14a 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 "$@" } diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml index 8dff425a9..e9ebccefa 100644 --- 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 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