From 5c2ac60f7617e1e51caa82daa826679e0a372377 Mon Sep 17 00:00:00 2001
From: Dustin Blackman <github@dustinblackman.com>
Date: Tue, 12 Mar 2024 21:42:39 -0400
Subject: [PATCH] chore: bring in zig

---
 .devcontainer/Dockerfile           | 12 +++++++-----
 .devcontainer/build.sh             |  8 ++++----
 .devcontainer/zcc.sh               |  3 +++
 .github/workflows/devcontainer.yml |  5 +++++
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100755 .devcontainer/zcc.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0971a65..4b73988 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -17,11 +17,13 @@ COPY .cargo/ /tmp/build-cache/.cargo
 
 # Only install what is needed for general development.
 WORKDIR /tmp/build-cache
-RUN cargo install cargo-run-bin
-RUN cargo bin committed --help
-RUN cargo bin mise --help
-RUN cargo cmd --help
-RUN cargo nextest --help
+COPY .bin/ /tmp/build-cache/
+RUN ls -lsa /tmp/build-cache
+RUN cargo install cargo-run-bin #bin
+RUN cargo bin committed --help #bin
+RUN cargo bin mise --help #bin
+RUN cargo cmd --help #bin
+RUN cargo nextest --help #bin
 # RUN cargo insta --help
 # RUN cargo deny --help
 # RUN cargo watch --help
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
index f694dce..62f76b7 100755
--- a/.devcontainer/build.sh
+++ b/.devcontainer/build.sh
@@ -6,20 +6,19 @@ PROGDIR=$(dirname "$(readlink -f "$0")")
 cd "$PROGDIR/.."
 
 BUILD_ARCH="$1"
-export EMPTY_GITHUB_TOKEN="$2"
 
 (
 	cd tools/node
 	npm ci
 )
 
-echo "$EMPTY_GITHUB_TOKEN" | gh auth login --with-token
 sudo apt-get update
 sudo apt-get install gcc-aarch64-linux-gnu
 rustup target add aarch64-unknown-linux-gnu
 cargo install cargo-run-bin
 cargo binstall --help
 export CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu
+export CC="$PROGDIR/zcc.sh"
 cargo bin committed --help || echo ""
 cargo bin mise --help || echo ""
 cargo cmd --help || echo ""
@@ -27,7 +26,8 @@ cargo nextest --help || echo ""
 cargo insta --help || echo ""
 cargo deny --helpA || echo ""
 cargo watch --help || echo ""
+rm -rf .bin/*/cargo-binstall
 find .bin
 
-# echo "[BUILD] Building $BUILD_ARCH"
-# tools/node/node_modules/.bin/devcontainer build --workspace-folder . --config ./.devcontainer/devcontainer-src.json --push --platform "linux/$BUILD_ARCH" --image-name ghcr.io/dustinblackman/devcontainer-oatmeal:latest-"$BUILD_ARCH"
+echo "[BUILD] Building $BUILD_ARCH"
+tools/node/node_modules/.bin/devcontainer build --workspace-folder . --config ./.devcontainer/devcontainer-src.json --push --platform "linux/$BUILD_ARCH" --image-name ghcr.io/dustinblackman/devcontainer-oatmeal:latest-"$BUILD_ARCH"
diff --git a/.devcontainer/zcc.sh b/.devcontainer/zcc.sh
new file mode 100755
index 0000000..b3f4587
--- /dev/null
+++ b/.devcontainer/zcc.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+zig cc -target aarch64-linux "$@"
diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml
index 020be37..281a487 100644
--- a/.github/workflows/devcontainer.yml
+++ b/.github/workflows/devcontainer.yml
@@ -43,7 +43,12 @@ jobs:
         with:
           targets: aarch64-unknown-linux-gnu
       - name: Build
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
+          sudo mkdir -p /usr/local/zig
+          curl -L https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz | sudo tar xz --strip-components=1 -C /usr/local/zig
+          export PATH="/usr/local/zig:$PATH"
           ./.devcontainer/build.sh ${{ matrix.arch }} ${{ secrets.EMPTY_GITHUB_TOKEN }}
 
   # release: