feat: re-host static gh (GitHub CLI) in the toolchain

.github/workflows/vendor.yml

@@ -3,7 +3,7 @@ name: vendor-toolchain
 # Build and publish the static toolchain for x86_64 and aarch64: clang, make
 # and git are compiled from source on NATIVE runners per arch (no QEMU — the
 # multi-hour x86_64 LLVM build runs here in normal CI time), while bpftool,
-# esbuild and the libbpf headers are re-hosted from upstream. All are published
+# esbuild, gh and the libbpf headers are re-hosted from upstream. All are published
 # as version-addressed assets on the `toolchain` release, with checksums
 # recorded back into build/versions.env.
 #
@@ -227,7 +227,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tool: [bpftool, veristat, lvh, esbuild]
+        tool: [bpftool, veristat, lvh, esbuild, gh]
         arch:
           - { platform: amd64, name: x86_64 }
           - { platform: arm64, name: aarch64 }
@@ -269,7 +269,7 @@ jobs:
           # <tool>-<arch> holding one file, so install them all the same way.
           # qemu is the exception (a bin/+share tree), packed separately below.
           for a in x86_64 aarch64; do
-            for t in clang make git bpftool veristat lvh esbuild; do
+            for t in clang make git bpftool veristat lvh esbuild gh; do
               install -Dm755 "artifacts/${t}-${a}/${t}" "${a}/${t}"
             done
           done
@@ -382,7 +382,7 @@ jobs:
           # Record the checksum of every binary we publish, so a consumer
           # verifies the exact artifact it downloads from our release.
           for arch in x86_64 aarch64; do
-            for tool in clang make bpftool veristat lvh esbuild git; do
+            for tool in clang make bpftool veristat lvh esbuild git gh; do
               s="$(sha256sum "$arch/$tool" | awk '{print $1}')"
               key="$(echo "$tool" | tr a-z A-Z)_SHA256_${arch}"
               sed -i "s|^${key}=.*|${key}=${s}|" build/versions.env
@@ -431,7 +431,7 @@ jobs:
           # Consumers pin this one tag.
           mkdir -p dist
           for a in x86_64 aarch64; do
-            for t in clang make bpftool veristat lvh esbuild git; do cp "$a/$t" "dist/${t}-${a}"; done
+            for t in clang make bpftool veristat lvh esbuild git gh; do cp "$a/$t" "dist/${t}-${a}"; done
           done
           cp libbpf-headers.tar.gz dist/libbpf-headers.tar.gz
           # qemu for the optional kernel-matrix runner (fetched on demand, not by `make`).
@@ -448,7 +448,7 @@ jobs:
           esac
           gh release view "$tag" >/dev/null 2>&1 \
             || gh release create "$tag" --title "$tag" $flags \
-                 --notes "Static build toolchain $tag — clang/make/git built from source; bpftool/esbuild/libbpf headers re-hosted; qemu for the kernel-matrix runner."
+                 --notes "Static build toolchain $tag — clang/make/git built from source; bpftool/veristat/esbuild/gh/libbpf headers re-hosted; qemu for the kernel-matrix runner."
           # --clobber so a same-version re-run refreshes assets.
           gh release upload "$tag" dist/* --clobber
 

README.md

@@ -40,6 +40,7 @@ before merge, so a typo can't silently mis-version a release.
 | `bpftool` | `vmlinux.h` (BTF dump) + link BPF objects          | official static release, re-hosted |
 | `veristat`| check `*.bpf.o` load + BPF verifier statistics     | official static release, re-hosted |
 | `esbuild` | bundle the JS entry                                | official static (Go) binary, re-hosted |
+| `gh`      | release/PR automation (CI + consumer tooling)      | official static (Go) binary, re-hosted |
 | `bpf/*.h` | libbpf program headers (`<bpf/bpf_helpers.h>`, …)  | libbpf bundled with bpftool |
 
 The table above is the **build** toolchain — what `make` resolves. The same
@@ -81,7 +82,7 @@ from this repo's release, checksum-verified. Pull updates with
 Change a tool pin in [`build/versions.env`](build/versions.env) and push — the
 [`vendor-toolchain`](.github/workflows/vendor.yml) workflow rebuilds clang/make/
 git (and the test-runner qemu) on native x86_64 and arm64 runners, re-hosts
-bpftool/veristat/lvh/esbuild/headers,
+bpftool/veristat/lvh/esbuild/gh/headers,
 **computes the next semver tag** (highest existing, bumped by the level the
 commit messages ask for — minor by default), publishes all assets to
 that immutable release, and records the version + checksums into `versions.env`.
@@ -134,5 +135,5 @@ Build a single tool locally:
 
 ```sh
 build/build-clang.sh arm64        # or amd64; also build-make.sh / build-git.sh / build-qemu.sh
-build/fetch-bpftool.sh            # prebuilt; also fetch-veristat.sh / fetch-lvh.sh / fetch-esbuild.sh / fetch-libbpf-headers.sh
+build/fetch-bpftool.sh            # prebuilt; also fetch-veristat.sh / fetch-lvh.sh / fetch-esbuild.sh / fetch-gh.sh / fetch-libbpf-headers.sh
 ```

build/fetch-gh.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+# Producer step: pull the official static gh (GitHub CLI) binary from cli/cli
+# into v/<arch>/gh so CI can re-host it on our toolchain release. gh is a single
+# fully-static Go binary, so we re-host it like esbuild/veristat rather than
+# build it. The consumer-facing integrity check is the published binary's
+# checksum (versions.env, verified by build/fetch-toolchain.sh), so this
+# upstream fetch — run in CI from the official release over TLS — isn't pinned.
+#
+#   build/fetch-gh.sh [amd64|arm64]   (default: both)
+
+set -eu
+
+HERE="$(cd "$(dirname "$0")" && pwd)"
+V="$(dirname "$HERE")"
+. "$HERE/versions.env"
+
+fetch() {
+	plat="$1"
+	case "$plat" in
+		amd64) arch=x86_64  ;;
+		arm64) arch=aarch64 ;;
+		*) echo "error: unknown arch '$plat'" >&2; exit 1 ;;
+	esac
+	url="https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${plat}.tar.gz"
+	tmp="$(mktemp -d)"
+	echo ">> fetching gh ${GH_VERSION} for ${plat}"
+	curl -fSL -o "$tmp/gh.tar.gz" "$url"
+	mkdir -p "$V/$arch"
+	tar xzf "$tmp/gh.tar.gz" -C "$tmp"
+	# Tarball extracts to gh_<ver>_linux_<plat>/bin/gh; glob the version dir.
+	cp "$tmp"/gh_*/bin/gh "$V/$arch/gh"
+	chmod +x "$V/$arch/gh"
+	rm -rf "$tmp"
+	echo ">> done: $V/$arch/gh"
+}
+
+if [ "$#" -eq 0 ]; then
+	fetch amd64
+	fetch arm64
+else
+	fetch "$1"
+fi

build/versions.env

@@ -61,6 +61,14 @@ ESBUILD_VERSION=0.28.1
 ESBUILD_SHA256_x86_64=0c6588b092a2c291a72bab90659f3c9e0e25e0fe59c9ac12b4dae4d945e5548c
 ESBUILD_SHA256_aarch64=51e829ba36f36be6d9aea6e329ddc4f9350302339b16aaca96a3cb97f64a8ebb
 
+# gh — the GitHub CLI, for release/PR automation (CI and consumer tooling).
+# Official static (Go) binary from cli/cli, re-hosted on our "toolchain"
+# release like esbuild. CI records the per-arch binary checksum (consumers
+# verify the binary, not the upstream tarball).
+GH_VERSION=2.95.0
+GH_SHA256_x86_64=
+GH_SHA256_aarch64=
+
 # qemu — NOT part of the build toolchain: a fully-static qemu-system for the
 # optional kernel-matrix test runner (boots lvh kernel images). Built per-arch
 # from source (see Dockerfile.qemu / build-qemu.sh), trimmed to the binary plus

embed/fetch-toolchain.sh

@@ -80,6 +80,7 @@ fetch_bin bpftool
 fetch_bin veristat
 fetch_bin esbuild
 fetch_bin git
+fetch_bin gh
 
 # libbpf program headers: arch-independent, one copy per version, beside the
 # per-arch tool dirs ($key/include/bpf/*.h).

embed/toolchain.mk

@@ -1,4 +1,4 @@
-# Resolve the static build toolchain (clang, bpftool, veristat, esbuild, git) — included
+# Resolve the static build toolchain (clang, bpftool, veristat, esbuild, git, gh) — included
 # by the project Makefile before build/bpf.mk, so the tools are set before any
 # rule uses them. A `make CLANG=…` CLI override beats this.
 #
@@ -11,7 +11,7 @@
 # Falls back to host tools on PATH when no lock is present.
 #
 # The vendored binaries are Linux musl-static, so the cache is only used on
-# Linux. On any other host (macOS, BSD) we leave CLANG/BPFTOOL/ESBUILD/GIT
+# Linux. On any other host (macOS, BSD) we leave CLANG/BPFTOOL/ESBUILD/GIT/GH
 # unset, falling through to host tools on PATH — macOS is an edit-here,
 # build-on-Linux host for BPF work.
 
@@ -36,6 +36,7 @@ ifneq ($(TOOLCHAIN_LOCK),)
   VERISTAT ?= $(TOOLCHAIN_DIR)/veristat
   ESBUILD  ?= $(TOOLCHAIN_DIR)/esbuild
   GIT      ?= $(TOOLCHAIN_DIR)/git
+  GH       ?= $(TOOLCHAIN_DIR)/gh
   # libbpf program headers are arch-independent: one copy per version key,
   # beside the per-arch tool dirs.
   BPF_SYSINCLUDE ?= $(YEET_CACHE_DIR)/toolchain/$(TOOLCHAIN_KEY)/include
@@ -45,6 +46,7 @@ endif
 VERISTAT ?= veristat
 ESBUILD  ?= esbuild
 GIT      ?= git
+GH       ?= gh
 
 # Fill the cache for this arch, downloading any missing tool once. A no-op
 # when no lock is present (PATH case).