Skip to content

Commit

Permalink
Fix zig build again (#14165)
Browse files Browse the repository at this point in the history
  • Loading branch information
Electroid authored Sep 25, 2024
1 parent 73f90c3 commit 1f0f666
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions cmake/Globals.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,14 @@ else()
set(WARNING WARNING)
endif()

if(CI)
set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor)
else()
set(DEFAULT_VENDOR_PATH ${CWD}/vendor)
endif()

optionx(VENDOR_PATH FILEPATH "The path to the vendor directory" DEFAULT ${DEFAULT_VENDOR_PATH})
# TODO: This causes flaky zig builds in CI, so temporarily disable it.
# if(CI)
# set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor)
# else()
# set(DEFAULT_VENDOR_PATH ${CWD}/vendor)
# endif()

optionx(VENDOR_PATH FILEPATH "The path to the vendor directory" DEFAULT ${CWD}/vendor)
optionx(TMP_PATH FILEPATH "The path to the temporary directory" DEFAULT ${BUILD_PATH}/tmp)

optionx(FRESH BOOL "Set when --fresh is used" DEFAULT OFF)
Expand Down

0 comments on commit 1f0f666

Please sign in to comment.