From 5e8bae74b82325963f7cd27a4356a3e0150c673e Mon Sep 17 00:00:00 2001 From: TB Schardl Date: Sun, 21 Aug 2022 02:01:32 +0000 Subject: [PATCH] [github] Update llvm-project-tests based on upstream changes. --- .github/workflows/llvm-project-tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml index bd9ca558be69..f2df4474b9d8 100644 --- a/.github/workflows/llvm-project-tests.yml +++ b/.github/workflows/llvm-project-tests.yml @@ -59,9 +59,15 @@ concurrency: group: llvm-project-${{ github.workflow }}-${{ inputs.projects }}${{ github.ref }} cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }} +# env: +# # Workaround for build faliure on Mac OS X: llvm.org/PR46190, https://github.com/actions/virtual-environments/issues/2274 +# CPLUS_INCLUDE_PATH: /usr/local/Cellar/llvm/14.0.6/include/c++/v1:/usr/local/Cellar/llvm@13/13.0.1/include/c++/v1:/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/usr/include + env: - # Workaround for build faliure on Mac OS X: llvm.org/PR46190, https://github.com/actions/virtual-environments/issues/2274 - CPLUS_INCLUDE_PATH: /usr/local/Cellar/llvm/14.0.6/include/c++/v1:/usr/local/Cellar/llvm@13/13.0.1/include/c++/v1:/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/usr/include + # Workaround for https://github.com/actions/virtual-environments/issues/5900. + # This should be a no-op for non-mac OSes + CPLUS_INCLUDE_PATH: /usr/local/Cellar/llvm/14.0.6_1/include/c++/v1:/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/usr/include + # PKG_CONFIG_PATH: /usr/local/Homebrew/Library/Homebrew/os/mac/pkgconfig//11 jobs: lit-tests: @@ -84,6 +90,7 @@ jobs: - name: Check macOS (for debugging) if: startsWith(matrix.os, 'macos') run: | + ls /Library/Developer/CommandLineTools/SDKs find /usr/local -name "cmath*" # On Windows, starting with win19/20220814.1, cmake choose the 32-bit # python3.10.6 libraries instead of the 64-bit libraries when building