From 38690eedfbacc21a2eca7351d83bf47f84709dd8 Mon Sep 17 00:00:00 2001 From: Pierre Ferran Date: Wed, 17 Jan 2024 17:43:19 -0500 Subject: [PATCH] More CI fixes --- .github/workflows/ci.yml | 10 ++++++++-- .github/workflows/release.yml | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce8aaa2..32b6e90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,10 @@ jobs: - name: Install native dependencies run: | brew install pkg-config llvm - brew link llvm + sudo brew link llvm + echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile + export LDFLAGS="-L/usr/local/opt/llvm/lib" + export CPPFLAGS="-I/usr/local/opt/llvm/include" - name: Configure cmake (intel) run: | cmake -S . -B build_intel/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DVCPKG_TARGET_TRIPLET=x64-osx @@ -57,7 +60,10 @@ jobs: - name: Install native dependencies run: | brew install pkg-config llvm - brew link llvm + sudo brew link llvm + echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile + export LDFLAGS="-L/usr/local/opt/llvm/lib" + export CPPFLAGS="-I/usr/local/opt/llvm/include" - name: Configure cmake (arm64) run: | cmake -S . -B build_arm64/ -DVCPKG_BUILD_TYPE=release -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_OSX_ARCHITECTURES=arm64 -DVCPKG_TARGET_TRIPLET=arm64-osx diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40e8abb..5c9c4f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,7 +130,10 @@ jobs: - name: Install native dependencies run: | brew install pkg-config llvm - brew link llvm + sudo brew link llvm + echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> /Users/runner/.bash_profile + export LDFLAGS="-L/usr/local/opt/llvm/lib" + export CPPFLAGS="-I/usr/local/opt/llvm/include" - name: Run build script run: | ./manual_osx_build.sh 1