From dd6e17430d14b6e886dbdccc6b946e3de58159ec Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:50:40 +1200
Subject: [PATCH 1/2] CI: Test on Windows arm64 runners

https://github.blog/changelog/2025-04-14-windows-arm64-hosted-runners-now-available-in-public-preview/
---
 .github/workflows/ci_tests.yaml        | 4 +++-
 .github/workflows/ci_tests_dev.yaml    | 2 +-
 .github/workflows/ci_tests_legacy.yaml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index 262e8ffddb1..8acf53e9f35 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.11', '3.13']
-        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest, windows-11-arm]
         # Is it a draft Pull Request (true or false)?
         isDraft:
           - ${{ github.event.pull_request.draft }}
@@ -69,6 +69,8 @@ jobs:
             isDraft: true
           - os: windows-latest
             isDraft: true
+          - os: windows-11-arm
+            isDraft: true
         include:
           # Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
           - python-version: '3.11'
diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml
index b117e35a6ca..fd106e91ae5 100644
--- a/.github/workflows/ci_tests_dev.yaml
+++ b/.github/workflows/ci_tests_dev.yaml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-15, windows-2025]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macos-15, windows-2025, windows-11-arm]
         gmt_git_ref: [master]
     timeout-minutes: 30
     defaults:
diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml
index 770c1263cc5..578c4110272 100644
--- a/.github/workflows/ci_tests_legacy.yaml
+++ b/.github/workflows/ci_tests_legacy.yaml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2019]
+        os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2019, windows-11-arm]
         gmt_version: ['6.4']
     timeout-minutes: 30
     defaults:

From 41ea21ef57151631497c6c92b9b0d19ffdae0e8e Mon Sep 17 00:00:00 2001
From: Wei Ji <23487320+weiji14@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:55:21 +1200
Subject: [PATCH 2/2] Update xfail note to say ARM64 without Linux

---
 pygmt/tests/test_contour.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pygmt/tests/test_contour.py b/pygmt/tests/test_contour.py
index 2cd2cc2c5ee..b3c7e7fe8fa 100644
--- a/pygmt/tests/test_contour.py
+++ b/pygmt/tests/test_contour.py
@@ -31,7 +31,7 @@ def fixture_region():
 
 
 @pytest.mark.mpl_image_compare
-@pytest.mark.xfail(platform.machine() == "aarch64", reason="Fails on Linux ARM64")
+@pytest.mark.xfail(platform.machine() == "aarch64", reason="Fails on ARM64")
 def test_contour_vec(region):
     """
     Plot an x-centered gaussian kernel with different y scale.
@@ -132,7 +132,7 @@ def test_contour_multiple_levels(region):
 
 
 @pytest.mark.mpl_image_compare(filename="test_contour_vec.png")
-@pytest.mark.xfail(platform.machine() == "aarch64", reason="Fails on Linux ARM64")
+@pytest.mark.xfail(platform.machine() == "aarch64", reason="Fails on ARM64")
 def test_contour_incols_transposed_data(region):
     """
     Make sure that transposing the data matrix still produces a correct result with