From f3e3ad97cdf7b1235e1a3c94020fc8a3690b78fb Mon Sep 17 00:00:00 2001 From: dave caruso Date: Wed, 11 Sep 2024 23:04:37 -0700 Subject: [PATCH] chore: attempt to fix ci script again --- build | 12 ++++++++---- ci | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build b/build index bc8ec5cf0232d7ad0e34c2cb767291ab42ca402a..45dfa384ee0db652d07a879a09496fa63454e187 100755 --- a/build +++ b/build @@ -11,7 +11,11 @@ cd -- "$(dirname -- "$0")" ZIG_VERSION=$(grep .minimum_zig_version build.zig.zon \ | cut -d '"' -f 2) -ZIG=".zig-cache/zig/$ZIG_VERSION/zig" +if [ -z "$ZIG_LOCAL_CACHE_DIR" ]; then + ZIG_LOCAL_CACHE_DIR=".zig-cache" +fi + +ZIG="$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION/zig" if [ ! -f "$ZIG" ]; then OS=$(uname -s | tr '[:upper:]' '[:lower:]') if [ "$OS" = "darwin" ]; then @@ -40,12 +44,12 @@ if [ ! -f "$ZIG" ]; then exit 1 fi - mkdir -p .zig-cache/zig/$ZIG_VERSION + mkdir -p "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION" curl -fsSL --retry 3 --retry-delay 3 $URL \ - | tar -xJ --strip-components=1 -C .zig-cache/zig/$ZIG_VERSION + | tar -xJ --strip-components=1 -C "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION" if [ "$($ZIG version)" != "$ZIG_VERSION" ]; then echo "Zig failed to install." - rm -rf .zig-cache/zig/$ZIG_VERSION + rm -rf "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION" exit 1 fi fi diff --git a/ci b/ci index 2e769eea97a156523373f03770d3f2815b0ef3ce..4f61dbd6e74747f7ac9c6ba27852af5eded12d0f 100755 --- a/ci +++ b/ci @@ -22,7 +22,7 @@ if [ -n "$BUILDKITE" ]; then mkdir zig-out/site cp zig-out/package/README.html zig-out/site/index.html - CLOUDFLARE_API_KEY=$(buildkite-agent secret get CLOUDFLARE_API_KEY) \ + CLOUDFLARE_API_TOKEN=$(buildkite-agent secret get CLOUDFLARE_API_TOKEN) \ CLOUDFLARE_ACCOUNT_ID=$(buildkite-agent secret get CLOUDFLARE_ACCOUNT_ID) \ npx wrangler pages deploy zig-out/site --commit-hash "$commit" --no-bundle --project-name language-manual fi -- 2.54.0