Skip to content

Commit 274da93

Browse files
umar456umar456
committed
Fix several CI issues due to changes in GitHub actions' environment
VCPKG_ROOT is now defined as an environment variable in GitHub actions. This change causes some of our jobs to fail because our scripts detect the environment variable to trigger some work. In this commit I remove the VCPKG_ROOT environment variable from the ubuntu jobs and remove the setting of the VCPKG_ROOT CMake variable on the windows job Use clean-after-build flag instead of Remove-Item to clean vcpkg builds Fix missing expat package in new macOS GitHub workflow
1 parent 1731fff commit 274da93

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

‎.github/workflows/docs_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
3333
- name: Configure
3434
run: |
35-
mkdir build && cd build
35+
mkdir build && cd build && unset VCPKG_ROOT
3636
cmake -DAF_BUILD_CPU:BOOL=OFF -DAF_BUILD_CUDA:BOOL=OFF \
3737
-DAF_BUILD_OPENCL:BOOL=OFF -DAF_BUILD_UNIFIED:BOOL=OFF \
3838
-DAF_BUILD_EXAMPLES:BOOL=OFF -DBUILD_TESTING:BOOL=OFF \

‎.github/workflows/unix_cpu_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install Dependencies for Macos
5959
if: matrix.os == 'macos-latest'
6060
run: |
61-
brew install boost fontconfig glfw freeimage fftw lapack openblas
61+
brew install boost fontconfig glfw freeimage fftw lapack openblas expat
6262
echo "CMAKE_PROGRAM=cmake" >> $GITHUB_ENV
6363
6464
- name: Install Common Dependencies for Ubuntu
@@ -103,7 +103,7 @@ jobs:
103103
backend=$(if [ "$USE_MKL" == 1 ]; then echo "Intel-MKL"; else echo "FFTW/LAPACK/BLAS"; fi)
104104
buildname="$buildname-cpu-$BLAS_BACKEND"
105105
cmake_rpath=$(if [ $OS_NAME == 'macos-latest' ]; then echo "-DCMAKE_INSTALL_RPATH=/opt/arrayfire/lib"; fi)
106-
mkdir build && cd build
106+
mkdir build && cd build && unset VCPKG_ROOT
107107
${CMAKE_PROGRAM} -G Ninja \
108108
-DCMAKE_MAKE_PROGRAM:FILEPATH=${GITHUB_WORKSPACE}/ninja \
109109
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF \

‎.github/workflows/win_cpu_build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ jobs:
3636
cd vcpkg
3737
git checkout $env:VCPKG_HASH
3838
.\bootstrap-vcpkg.bat
39-
.\vcpkg.exe install boost-compute boost-math boost-stacktrace fftw3 freeimage freetype[core] forge glfw3 openblas
40-
Remove-Item .\downloads,.\buildtrees,.\packages -Recurse -Force
39+
.\vcpkg.exe install --clean-after-build boost-compute boost-math boost-stacktrace fftw3 freeimage freetype[core] forge glfw3 openblas
4140
4241
- name: CMake Configure
4342
run: |
@@ -49,7 +48,6 @@ jobs:
4948
$buildname = "$buildname-cpu-openblas"
5049
mkdir build && cd build
5150
cmake .. -G "Visual Studio 17 2022" -A x64 `
52-
-DVCPKG_ROOT:PATH="~/vcpkg" `
5351
-DVCPKG_MANIFEST_MODE:BOOL=OFF `
5452
-DAF_BUILD_CUDA:BOOL=OFF -DAF_BUILD_OPENCL:BOOL=OFF `
5553
-DAF_BUILD_UNIFIED:BOOL=OFF -DAF_BUILD_FORGE:BOOL=ON `

0 commit comments

Comments
 (0)