From e6236880afcdaa9891d93007a4d4d4481a184c3f Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Wed, 25 Sep 2024 12:55:16 -0700 Subject: [PATCH 1/2] Fix --- cmake/Globals.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/Globals.cmake b/cmake/Globals.cmake index 3b9714548bd15..2e30bbf3a5ce0 100644 --- a/cmake/Globals.cmake +++ b/cmake/Globals.cmake @@ -129,13 +129,13 @@ else() set(WARNING WARNING) endif() -if(CI) - set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor) -else() - set(DEFAULT_VENDOR_PATH ${CWD}/vendor) -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}) +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) From 36ca8bc3eba846bc877cfc2c9dee2108ffa1b5bf Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Wed, 25 Sep 2024 13:02:45 -0700 Subject: [PATCH 2/2] Fix --- cmake/Globals.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Globals.cmake b/cmake/Globals.cmake index 2e30bbf3a5ce0..303e49802a1a4 100644 --- a/cmake/Globals.cmake +++ b/cmake/Globals.cmake @@ -129,6 +129,7 @@ else() set(WARNING WARNING) endif() +# TODO: This causes flaky zig builds in CI, so temporarily disable it. # if(CI) # set(DEFAULT_VENDOR_PATH ${CACHE_PATH}/vendor) # else()