From 910e9b00badbd76277a67b2088a9c31f9ee7c3aa Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Sun, 1 Feb 2026 08:43:07 -0700
Subject: [PATCH] CI: test `cmov` on `aarch64` native runners

Replaces `cross` tests with native runners
---
 .github/workflows/cmov.yml    | 39 ++++++++++++++++++++++++-----------
 .github/workflows/ctutils.yml | 10 ++++-----
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cmov.yml b/.github/workflows/cmov.yml
index b0e0f723..06bd6e96 100644
--- a/.github/workflows/cmov.yml
+++ b/.github/workflows/cmov.yml
@@ -55,27 +55,47 @@ jobs:
     strategy:
       matrix:
         include:
-          # `x86` Linux
+          # `aarch64` Linux
+          - target: aarch64-unknown-linux-gnu
+            rust: 1.85.0 # MSRV
+            runner: ubuntu-24.04-arm
+          - target: aarch64-unknown-linux-gnu
+            rust: stable
+            runner: ubuntu-24.04-arm
+
+          # `aarch64` macOS
+          - target: aarch64-apple-darwin
+            rust: 1.85.0 # MSRV
+            runner: macos-latest
+          - target: aarch64-apple-darwin
+            rust: stable
+            runner: macos-latest
+
+          # `x86` Linux (32-bit)
           - target: i686-unknown-linux-gnu
             platform: ubuntu-latest
             rust: 1.85.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
+          - target: i686-unknown-linux-gnu
+            platform: ubuntu-latest
+            rust: stable
+            deps: sudo apt update && sudo apt install gcc-multilib
 
           # `x86_64` Linux
           - target: x86_64-unknown-linux-gnu
             platform: ubuntu-latest
             rust: 1.85.0 # MSRV
+          - target: x86_64-unknown-linux-gnu
+            platform: ubuntu-latest
+            rust: stable
 
           # `x86_64` Windows
           - target: x86_64-pc-windows-msvc
             platform: windows-latest
             rust: 1.85.0 # MSRV
-
-          # `x86_64` macOS
-          - target: x86_64-apple-darwin
-            platform: macos-latest
-            rust: 1.85.0 # MSRV
-
+          - target: x86_64-pc-windows-msvc
+            platform: windows-latest
+            rust: stable
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v6
@@ -106,11 +126,6 @@ jobs:
             rust: 1.85.0 # MSRV
           - target: armv7-unknown-linux-gnueabi
             rust: stable # MSRV
-          # ARM64
-          - target: aarch64-unknown-linux-gnu
-            rust: 1.85.0 # MSRV
-          - target: aarch64-unknown-linux-gnu
-            rust: stable
           # PPC32
           - target: powerpc-unknown-linux-gnu
             rust: 1.85.0 # MSRV
diff --git a/.github/workflows/ctutils.yml b/.github/workflows/ctutils.yml
index 862351ad..1adf9aeb 100644
--- a/.github/workflows/ctutils.yml
+++ b/.github/workflows/ctutils.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - ".github/workflows/ctutils.yml"
+      - "cmov/**"
       - "ctutils/**"
       - "Cargo.*"
   push:
@@ -46,11 +47,10 @@ jobs:
       - run: cargo build --target ${{ matrix.target }}
       - run: cargo build --target ${{ matrix.target }} --features alloc
 
-  # Disabled until there's a stable `cmov` v0.5.0 release
-  #  minimal-versions:
-  #    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-  #    with:
-  #      working-directory: ${{ github.workflow }}
+  minimal-versions:
+    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+    with:
+      working-directory: ${{ github.workflow }}
 
   test:
     runs-on: ubuntu-latest