[github] Update llvm-project-tests based on upstream changes.

neboat · Jan 15, 2025 · 5e8bae7 · 5e8bae7
1 parent d471dee
commit 5e8bae7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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