From 9997c70bbd3f2320c9dc466677e38c1dc59359a4 Mon Sep 17 00:00:00 2001
From: Mehul Arora <mehul@s2.dev>
Date: Thu, 29 Jan 2026 00:14:20 -0500
Subject: [PATCH 1/3] fix: pin cross container images to 0.2.5

---
 Cross.toml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Cross.toml

diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..0cdb577
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,5 @@
+[target.aarch64-unknown-linux-musl]
+image = "ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.5"
+
+[target.x86_64-unknown-linux-musl]
+image = "ghcr.io/cross-rs/x86_64-unknown-linux-musl:0.2.5"

From cb8d9da957deb96f2ed0b756ec3f35c2e685c5b4 Mon Sep 17 00:00:00 2001
From: Mehul Arora <mehul@s2.dev>
Date: Thu, 29 Jan 2026 00:14:45 -0500
Subject: [PATCH 2/3] test: add temp workflow to verify cross fix

---
 .github/workflows/test-cross.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/test-cross.yml

diff --git a/.github/workflows/test-cross.yml b/.github/workflows/test-cross.yml
new file mode 100644
index 0000000..ec53389
--- /dev/null
+++ b/.github/workflows/test-cross.yml
@@ -0,0 +1,26 @@
+name: Test Cross Build
+
+on:
+  pull_request:
+    paths:
+      - 'Cross.toml'
+      - '.github/workflows/test-cross.yml'
+
+jobs:
+  test-cross:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          rustflags: ""
+          target: aarch64-unknown-linux-musl
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross --rev 846d469b
+      - name: Build
+        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 883b2b5a6a5b565e921563379f8c29707a877c49 Mon Sep 17 00:00:00 2001
From: Mehul Arora <mehul@s2.dev>
Date: Thu, 29 Jan 2026 00:20:16 -0500
Subject: [PATCH 3/3] chore: remove temp test workflow

---
 .github/workflows/test-cross.yml | 26 --------------------------
 1 file changed, 26 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 ec53389..0000000
--- a/.github/workflows/test-cross.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test Cross Build
-
-on:
-  pull_request:
-    paths:
-      - 'Cross.toml'
-      - '.github/workflows/test-cross.yml'
-
-jobs:
-  test-cross:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          rustflags: ""
-          target: aarch64-unknown-linux-musl
-      - name: Install cross
-        run: cargo install cross --git https://github.com/cross-rs/cross --rev 846d469b
-      - name: Build
-        run: cross build --release --package s2-cli --target aarch64-unknown-linux-musl
-      - name: Verify binary
-        run: file target/aarch64-unknown-linux-musl/release/s2