From c0c42909e72a241dd1166707504e3cb1bc263538 Mon Sep 17 00:00:00 2001
From: Mehul Arora <mehul@s2.dev>
Date: Wed, 28 Jan 2026 23:57:22 -0500
Subject: [PATCH 1/2] fix: pin cross to known working commit

---
 .github/workflows/release.yml    |  2 +-
 .github/workflows/test-cross.yml | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test-cross.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8de8cf5..97550be 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,7 +85,7 @@ jobs:
         run: echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
       - name: Install cross
         if: matrix.use_cross
-        run: cargo install cross --git https://github.com/cross-rs/cross
+        run: cargo install cross --git https://github.com/cross-rs/cross --rev 846d469b
       - name: Build
         run: ${{ matrix.use_cross && 'cross' || 'cargo' }} build --release --package s2-cli --target ${{ matrix.target }}
       - name: Create pem and certificate.der files
diff --git a/.github/workflows/test-cross.yml b/.github/workflows/test-cross.yml
new file mode 100644
index 0000000..8546582
--- /dev/null
+++ b/.github/workflows/test-cross.yml
@@ -0,0 +1,23 @@
+name: Test Cross Build
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/test-cross.yml'
+      - '.github/workflows/release.yml'
+
+jobs:
+  test-cross:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          rustflags: ""
+          target: aarch64-unknown-linux-musl
+      - name: Install cross (pinned commit)
+        run: cargo install cross --git https://github.com/cross-rs/cross --rev 846d469b --force
+      - name: Build s2-cli for aarch64-unknown-linux-musl
+        run: cross build --release --package s2-cli --target aarch64-unknown-linux-musl
+      - name: Verify binary
+        run: file target/aarch64-unknown-linux-musl/release/s2

From b472f7f37337dc0a8f9bd66e95185b827e52cfad Mon Sep 17 00:00:00 2001
From: Mehul Arora <mehul@s2.dev>
Date: Thu, 29 Jan 2026 00:06:32 -0500
Subject: [PATCH 2/2] chore: remove temporary test workflow

---
 .github/workflows/test-cross.yml | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 .github/workflows/test-cross.yml

diff --git a/.github/workflows/test-cross.yml b/.github/workflows/test-cross.yml
deleted file mode 100644
index 8546582..0000000
--- a/.github/workflows/test-cross.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Test Cross Build
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/test-cross.yml'
-      - '.github/workflows/release.yml'
-
-jobs:
-  test-cross:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          rustflags: ""
-          target: aarch64-unknown-linux-musl
-      - name: Install cross (pinned commit)
-        run: cargo install cross --git https://github.com/cross-rs/cross --rev 846d469b --force
-      - name: Build s2-cli for aarch64-unknown-linux-musl
-        run: cross build --release --package s2-cli --target aarch64-unknown-linux-musl
-      - name: Verify binary
-        run: file target/aarch64-unknown-linux-musl/release/s2