From d74a192345890e235b5e6dead080235c1917f44b Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Wed, 7 Aug 2024 14:03:20 -0700 Subject: [PATCH] Fix submodules script --- .buildkite/scripts/env.sh | 1 + scripts/all-dependencies.sh | 18 +++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.buildkite/scripts/env.sh b/.buildkite/scripts/env.sh index fcea58e949bb81..2acc1e63a5329c 100755 --- a/.buildkite/scripts/env.sh +++ b/.buildkite/scripts/env.sh @@ -111,6 +111,7 @@ function export_environment() { rm -rf "$ZIG_LOCAL_CACHE_DIR" rm -rf "$ZIG_GLOBAL_CACHE_DIR" rm -rf "$BUN_DEPS_CACHE_DIR" + mkdir -p "$BUN_DEPS_CACHE_DIR" export CCACHE_RECACHE="1" fi } diff --git a/scripts/all-dependencies.sh b/scripts/all-dependencies.sh index 1830f025d5f47b..35d371cfe7f777 100755 --- a/scripts/all-dependencies.sh +++ b/scripts/all-dependencies.sh @@ -23,22 +23,18 @@ while getopts "f" opt; do esac done -if [ "$RELEASE" == "1" ]; then - FORCE=1 -fi - BUILT_ANY=0 SUBMODULES= CACHE_DIR= CACHE=0 -if [ -n "$BUN_DEPS_CACHE_DIR" ]; then - CACHE_DIR="$BUN_DEPS_CACHE_DIR" - mkdir -p "$CACHE_DIR" - CACHE=1 - SUBMODULES="$(git submodule status)" -fi -mkdir -p "$BUN_DEPS_OUT_DIR" +if [ "$RELEASE" == "1" ]; then + FORCE=1 +elif [ -n "$BUN_DEPS_CACHE_DIR" ]; then + CACHE_DIR="$BUN_DEPS_CACHE_DIR" + CACHE=1 + SUBMODULES="$(git submodule status)" +fi dep() { local submodule="$1"