authorgravatar for me@paperdave.netdave caruso <me@paperdave.net> 2024-09-11 23:04:37-07:00
committergravatar for me@paperdave.netdave caruso <me@paperdave.net> 2024-09-11 23:04:37-07:00
logf3e3ad97cdf7b1235e1a3c94020fc8a3690b78fb
tree7c8636fff77f63dbade2c2cf9fa7be0a3d9027cf
parent3cd58b85e072ea148d9a51bef65e48492a07eef2
signature Commit is signed but in an unrecognized format.

chore: attempt to fix ci script again

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

build+8-4
...@@ -11,7 +11,11 @@ cd -- "$(dirname -- "$0")"...@@ -11,7 +11,11 @@ cd -- "$(dirname -- "$0")"
11ZIG_VERSION=$(grep .minimum_zig_version build.zig.zon \11ZIG_VERSION=$(grep .minimum_zig_version build.zig.zon \
12 | cut -d '"' -f 2)12 | 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"
15if [ ! -f "$ZIG" ]; then19if [ ! -f "$ZIG" ]; then
16 OS=$(uname -s | tr '[:upper:]' '[:lower:]')20 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
17 if [ "$OS" = "darwin" ]; then21 if [ "$OS" = "darwin" ]; then
...@@ -40,12 +44,12 @@ if [ ! -f "$ZIG" ]; then...@@ -40,12 +44,12 @@ if [ ! -f "$ZIG" ]; then
40 exit 144 exit 1
41 fi45 fi
4246
43 mkdir -p .zig-cache/zig/$ZIG_VERSION47 mkdir -p "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
44 curl -fsSL --retry 3 --retry-delay 3 $URL \48 curl -fsSL --retry 3 --retry-delay 3 $URL \
45 | tar -xJ --strip-components=1 -C .zig-cache/zig/$ZIG_VERSION49 | tar -xJ --strip-components=1 -C "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
46 if [ "$($ZIG version)" != "$ZIG_VERSION" ]; then50 if [ "$($ZIG version)" != "$ZIG_VERSION" ]; then
47 echo "Zig failed to install."51 echo "Zig failed to install."
48 rm -rf .zig-cache/zig/$ZIG_VERSION52 rm -rf "$ZIG_LOCAL_CACHE_DIR/zig/$ZIG_VERSION"
49 exit 153 exit 1
50 fi54 fi
51fi55fi
ci+1-1
...@@ -22,7 +22,7 @@ if [ -n "$BUILDKITE" ]; then...@@ -22,7 +22,7 @@ if [ -n "$BUILDKITE" ]; then
22 mkdir zig-out/site22 mkdir zig-out/site
23 cp zig-out/package/README.html zig-out/site/index.html23 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) \
26 CLOUDFLARE_ACCOUNT_ID=$(buildkite-agent secret get CLOUDFLARE_ACCOUNT_ID) \26 CLOUDFLARE_ACCOUNT_ID=$(buildkite-agent secret get CLOUDFLARE_ACCOUNT_ID) \
27 npx wrangler pages deploy zig-out/site --commit-hash "$commit" --no-bundle --project-name language-manual27 npx wrangler pages deploy zig-out/site --commit-hash "$commit" --no-bundle --project-name language-manual
28fi28fi