From 1dd3c5e96a1c5e81ec6f74991d39707f01eb5c43 Mon Sep 17 00:00:00 2001
From: Vedant Mohan Goyal <83997633+vedantmgoyal9@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:54:17 +0530
Subject: [PATCH 1/5] [Dockerfile] Update Rust version & add Windows ARM64
 target

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 42c8bee..a45a4b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.79.0
+ARG RUST_VERSION=1.82.0
 
 FROM rust:$RUST_VERSION as builder
 
@@ -39,6 +39,7 @@ RUN rustup target add \
     arm-unknown-linux-musleabihf \
     x86_64-apple-darwin \
     aarch64-apple-darwin \
-    x86_64-pc-windows-gnu
+    x86_64-pc-windows-gnu \
+    aarch64-pc-windows-gnullvm
 
 COPY --from=builder /cargo-zigbuild/target/release/cargo-zigbuild /usr/local/cargo/bin/

From f7c3e0b51010e7b3d51fd6806b590698051a16fd Mon Sep 17 00:00:00 2001
From: Vedant Mohan Goyal <83997633+vedantmgoyal9@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:10:58 +0530
Subject: [PATCH 2/5] Update CI.yml

---
 .github/workflows/CI.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index f7ae4cf..cf1186d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -31,13 +31,9 @@ jobs:
       # If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
-        toolchain: [1.74.0, stable, nightly]
-        zig: [0.10.1, 0.13.0, master]
-        exclude:
-          # Only test MSRV with zig stable version
-          - toolchain: 1.74.0
-            zig: master
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        toolchain: [stable, nightly]
+        zig: [0.13.0, master]
     env:
       RUST_BACKTRACE: "1"
       # SCCACHE_GHA_ENABLED: "true"

From 2637bce760b9a5fb139818b85c96935611c3da7c Mon Sep 17 00:00:00 2001
From: Vedant Mohan Goyal <83997633+vedantmgoyal9@users.noreply.github.com>
Date: Sun, 20 Oct 2024 16:21:34 +0530
Subject: [PATCH 3/5] [Dockerfile] Update Zig version to 0.13.0

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a45a4b1..c7cfb62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN cargo build --manifest-path /cargo-zigbuild/Cargo.toml --release
 FROM rust:$RUST_VERSION
 
 # Install Zig
-ARG ZIG_VERSION=0.10.1
+ARG ZIG_VERSION=0.13.0
 RUN curl -L "https://ziglang.org/download/${ZIG_VERSION}/zig-linux-$(uname -m)-${ZIG_VERSION}.tar.xz" | tar -J -x -C /usr/local && \
     ln -s "/usr/local/zig-linux-$(uname -m)-${ZIG_VERSION}/zig" /usr/local/bin/zig
 

From 54ed04c922fd83c7c0746c20d504a8317224aa57 Mon Sep 17 00:00:00 2001
From: Vedant Mohan Goyal <83997633+vedantmgoyal9@users.noreply.github.com>
Date: Tue, 22 Oct 2024 05:54:05 +1100
Subject: [PATCH 4/5] Discard changes to .github/workflows/CI.yml

---
 .github/workflows/CI.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index cf1186d..f7ae4cf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -31,9 +31,13 @@ jobs:
       # If one platform fails, allow the rest to keep testing if `CI-no-fail-fast` label is present
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        toolchain: [stable, nightly]
-        zig: [0.13.0, master]
+        os: [ubuntu-latest, macos-13, windows-latest]
+        toolchain: [1.74.0, stable, nightly]
+        zig: [0.10.1, 0.13.0, master]
+        exclude:
+          # Only test MSRV with zig stable version
+          - toolchain: 1.74.0
+            zig: master
     env:
       RUST_BACKTRACE: "1"
       # SCCACHE_GHA_ENABLED: "true"

From 99d5ef7eb25258d22f698ee2a65b05a536d933d5 Mon Sep 17 00:00:00 2001
From: Vedant Mohan Goyal <83997633+vedantmgoyal9@users.noreply.github.com>
Date: Tue, 22 Oct 2024 00:24:52 +0530
Subject: [PATCH 5/5] [Dockerfile] Revert Zig back to 0.10.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c7cfb62..a45a4b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN cargo build --manifest-path /cargo-zigbuild/Cargo.toml --release
 FROM rust:$RUST_VERSION
 
 # Install Zig
-ARG ZIG_VERSION=0.13.0
+ARG ZIG_VERSION=0.10.1
 RUN curl -L "https://ziglang.org/download/${ZIG_VERSION}/zig-linux-$(uname -m)-${ZIG_VERSION}.tar.xz" | tar -J -x -C /usr/local && \
     ln -s "/usr/local/zig-linux-$(uname -m)-${ZIG_VERSION}/zig" /usr/local/bin/zig