From f4995220e217155b0e41e33849eb97951a050d5d Mon Sep 17 00:00:00 2001
From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Date: Fri, 2 Feb 2024 22:20:08 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Bump=20to=20`cibuildwheel`=202.1?=
 =?UTF-8?q?6.5,=20fix=20macOS=20arm64=20job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cd.yml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index b2fefe4..ab9a347 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -45,9 +45,7 @@ jobs:
           path: dist
 
   windows_wheels:
-    strategy:
-      fail-fast: false
-    name: Windows wheels
+    name: Windows wheels (amd64)
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
@@ -68,7 +66,7 @@ jobs:
       - name: Install MinGW compiler(s)
         run: choco install mingw
 
-      - uses: pypa/cibuildwheel@v2.16.4
+      - uses: pypa/cibuildwheel@v2.16.5
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -86,8 +84,6 @@ jobs:
           if-no-files-found: error
 
   linux_amd64_wheels:
-    strategy:
-      fail-fast: false
     name: Linux wheels (amd64)
     runs-on: ubuntu-latest
     steps:
@@ -100,7 +96,7 @@ jobs:
         with:
           python-version: 3.8
 
-      - uses: pypa/cibuildwheel@v2.16.4
+      - uses: pypa/cibuildwheel@v2.16.5
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -127,8 +123,6 @@ jobs:
           if-no-files-found: error
 
   linux_aarch64_wheels:
-    strategy:
-      fail-fast: false
     name: Linux wheels (aarch64)
     runs-on: ubuntu-latest
     steps:
@@ -146,7 +140,7 @@ jobs:
         with:
           platforms: all
 
-      - uses: pypa/cibuildwheel@v2.16.4
+      - uses: pypa/cibuildwheel@v2.16.5
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -201,8 +195,6 @@ jobs:
           if-no-files-found: error
 
   macos_x86_64_wheels:
-    strategy:
-      fail-fast: false
     name: macOS wheels (x86_64)
     runs-on: macos-latest
     steps:
@@ -222,7 +214,7 @@ jobs:
           cache: false
           check-latest: true
 
-      - uses: pypa/cibuildwheel@v2.16.4
+      - uses: pypa/cibuildwheel@v2.16.5
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -241,8 +233,6 @@ jobs:
           if-no-files-found: error
 
   macos_arm64_wheels:
-    strategy:
-      fail-fast: false
     name: macOS wheels (arm64)
     runs-on: macos-14
     steps:
@@ -253,7 +243,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Set up Go toolchain
         uses: actions/setup-go@v5
@@ -262,7 +252,7 @@ jobs:
           cache: false
           check-latest: true
 
-      - uses: pypa/cibuildwheel@v2.16.4
+      - uses: pypa/cibuildwheel@v2.16.5
         with:
           package-dir: .
           output-dir: wheelhouse
@@ -272,6 +262,8 @@ jobs:
           CIBW_TEST_COMMAND: >
             hugo version
             hugo env --logLevel debug
+          # Strange failure without this environment variable, check later if it's still needed
+          GOARCH: arm64
 
       - name: Upload wheels
         uses: actions/upload-artifact@v4