authorchloe caruso <git@paperclover.net> 2024-09-11 23:04:37-07:00
committerchloe caruso <git@paperclover.net> 2024-09-11 23:04:37-07:00
logcbc6e2529b82b57b70ab2d73099d0d8deaab5e98
tree7c8636fff77f63dbade2c2cf9fa7be0a3d9027cf
parent5c50ded2676caace6bf40626dc63685ad22cc3e1

chore: attempt to fix ci script again


2 files changed, 9 insertions(+), 5 deletions(-)

build+8-4
......@@ -11,7 +11,11 @@ cd -- "$(dirname -- "$0")"
1111ZIG_VERSION=$(grep .minimum_zig_version build.zig.zon \
1212 | cut -d '"' -f 2)
1313
14ZIG=".zig-cache/zig/$ZIG_VERSION/zig"
14if [ -z "$ZIG_LOCAL_CACHE_DIR" ]; then
15 ZIG_LOCAL_CACHE_DIR=".zig-cache"
16fi
17
18ZIG="$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION/zig"
1519if [ ! -f "$ZIG" ]; then
1620 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
1721 if [ "$OS" = "darwin" ]; then
......@@ -40,12 +44,12 @@ if [ ! -f "$ZIG" ]; then
4044 exit 1
4145 fi
4246
43 mkdir -p .zig-cache/zig/$ZIG_VERSION
47 mkdir -p "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
4448 curl -fsSL --retry 3 --retry-delay 3 $URL \
45 | tar -xJ --strip-components=1 -C .zig-cache/zig/$ZIG_VERSION
49 | tar -xJ --strip-components=1 -C "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
4650 if [ "$($ZIG version)" != "$ZIG_VERSION" ]; then
4751 echo "Zig failed to install."
48 rm -rf .zig-cache/zig/$ZIG_VERSION
52 rm -rf "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
4953 exit 1
5054 fi
5155fi
ci+1-1
......@@ -22,7 +22,7 @@ if [ -n "$BUILDKITE" ]; then
2222 mkdir zig-out/site
2323 cp zig-out/package/README.html zig-out/site/index.html
2424
25 CLOUDFLARE_API_KEY=$(buildkite-agent secret get CLOUDFLARE_API_KEY) \
25 CLOUDFLARE_API_TOKEN=$(buildkite-agent secret get CLOUDFLARE_API_TOKEN) \
2626 CLOUDFLARE_ACCOUNT_ID=$(buildkite-agent secret get CLOUDFLARE_ACCOUNT_ID) \
2727 npx wrangler pages deploy zig-out/site --commit-hash "$commit" --no-bundle --project-name language-manual
2828fi