From da009e7d045f50089a3c3c2151cfa24b4e58beec Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sun, 21 May 2023 21:57:15 +0200
Subject: [PATCH 01/18] Update test.yml

Testing support for Apple Silicon
---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e67637..576809e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -92,6 +92,7 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
+        CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
         CIBW_BEFORE_ALL_MACOS: brew install zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"

From 97c100c3e1fc69ac683beca56978af9e99bd4a0e Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sun, 21 May 2023 22:06:03 +0200
Subject: [PATCH 02/18] Update test.yml

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 576809e..bcb403b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,9 @@ jobs:
         # 3.10 was released 2021-10-04 and end-of-life will be 2026-10-25
         # 3.11 was released 2022-10-24 and end-of-life will be 2027-10-24
         python-version: ['3.7', '3.11']
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        #windows build is failing for some reason but I need to test the macos build. Ubuntu is also removed to speed up the tests.
+        #os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest]
 
     steps:
     - uses: actions/checkout@v2

From ac8a1121fcc1f1f806d65ba0750288c13f6c63be Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sun, 21 May 2023 22:12:30 +0200
Subject: [PATCH 03/18] Update test.yml

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bcb403b..092cf6d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,7 +67,9 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        #windows build is failing for some reason but I need to test the macos build. Ubuntu is also removed to speed up the tests.
+        #os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest]
         manylinux-image: [manylinux2014]
 
     steps:

From e1f3875ab43d3e4da49ac1a46a6b46e6b41cd064 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sun, 21 May 2023 22:20:38 +0200
Subject: [PATCH 04/18] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 092cf6d..cd01736 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -96,7 +96,7 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
-        CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+        CIBW_ARCHS_MACOS: "x86_64 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
         CIBW_BEFORE_ALL_MACOS: brew install zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"

From 34f0ecaa47471a331fe17adc20e915f7a55a5153 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 21:34:33 +0200
Subject: [PATCH 05/18] Update test.yml

Testing build on macos
---
 .github/workflows/test.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd01736..42c19bc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,10 +15,9 @@ jobs:
         # 3.9 was released 2020-10-05 and end-of-life will be 2025-10-25
         # 3.10 was released 2021-10-04 and end-of-life will be 2026-10-25
         # 3.11 was released 2022-10-24 and end-of-life will be 2027-10-24
-        python-version: ['3.7', '3.11']
-        #windows build is failing for some reason but I need to test the macos build. Ubuntu is also removed to speed up the tests.
-        #os: [macos-latest, ubuntu-latest, windows-latest]
-        os: [macos-latest]
+        # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
+        python-version: ['3.7', '3.12']
+        os: [macos-13, macos-14, ubuntu-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v2
@@ -67,9 +66,7 @@ jobs:
 
     strategy:
       matrix:
-        #windows build is failing for some reason but I need to test the macos build. Ubuntu is also removed to speed up the tests.
-        #os: [macos-latest, ubuntu-latest, windows-latest]
-        os: [macos-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
         manylinux-image: [manylinux2014]
 
     steps:
@@ -80,7 +77,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install Python Dependencies
       run: |

From f68130e18ad1321b000604599603ff5e905faeeb Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 21:37:11 +0200
Subject: [PATCH 06/18] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 42c19bc..abff324 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
         # 3.10 was released 2021-10-04 and end-of-life will be 2026-10-25
         # 3.11 was released 2022-10-24 and end-of-life will be 2027-10-24
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
-        python-version: ['3.7', '3.12']
+        python-version: ['3.8', '3.12']
         os: [macos-13, macos-14, ubuntu-latest, windows-latest]
 
     steps:
@@ -44,7 +44,7 @@ jobs:
     - name: Install Python Modules
       run: |
         python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel
+        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel setuptools
 
     - name: Test Installation From Tarball
       shell: bash

From bd735ff309a25318b764ea744573fdaa7e26d165 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 21:42:18 +0200
Subject: [PATCH 07/18] Update test.yml

---
 .github/workflows/test.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index abff324..577397b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,6 +29,11 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
+    - name: Install Dependencies (macos)
+      if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
+      run: |
+        sudo brew install zstd
+
     - name: Install Dependencies (ubuntu)
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -82,7 +87,7 @@ jobs:
     - name: Install Python Dependencies
       run: |
         python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel
+        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel setuptools
 
     - name: Build Tarball
       if: matrix.os == 'ubuntu-latest'

From 58136af4738848fd0e0af6d321c700f86187336e Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 21:42:57 +0200
Subject: [PATCH 08/18] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 577397b..113236c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install Dependencies (macos)
       if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
       run: |
-        sudo brew install zstd
+        brew install zstd
 
     - name: Install Dependencies (ubuntu)
       if: matrix.os == 'ubuntu-latest'

From dea791b8f3c10c2999d202ee2d96cf275e455ce7 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 21:56:36 +0200
Subject: [PATCH 09/18] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 113236c..74d9511 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install Dependencies (macos)
       if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
       run: |
-        brew install zstd
+        brew update && brew reinstall zstd
 
     - name: Install Dependencies (ubuntu)
       if: matrix.os == 'ubuntu-latest'
@@ -100,7 +100,7 @@ jobs:
         CIBW_ARCHS: auto64
         CIBW_ARCHS_MACOS: "x86_64 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
-        CIBW_BEFORE_ALL_MACOS: brew install zstd
+        CIBW_BEFORE_ALL_MACOS: brew update && brew reinstall zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"
         CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
       run: python -m cibuildwheel --output-dir dist

From b37a1dc08ab6de7d1b0fa01ffbd606024f0a080c Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:00:12 +0200
Subject: [PATCH 10/18] Update test.yml

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 74d9511..99b4e02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,8 @@ jobs:
         # 3.11 was released 2022-10-24 and end-of-life will be 2027-10-24
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
-        os: [macos-13, macos-14, ubuntu-latest, windows-latest]
+        #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
+        os: [macos-13, macos-14]
 
     steps:
     - uses: actions/checkout@v2

From 68efee9e0e233bc433e4096349e12c2287ab9307 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:04:24 +0200
Subject: [PATCH 11/18] Update test.yml

---
 .github/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99b4e02..c9764f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13, macos-14]
+        os: [macos-13]
 
     steps:
     - uses: actions/checkout@v2
@@ -72,7 +72,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
+        os: [macos-13]
         manylinux-image: [manylinux2014]
 
     steps:

From 5a92b30b6b1c2482ab7e03f67d48f3bc16ff5abc Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:15:53 +0200
Subject: [PATCH 12/18] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c9764f8..20c9482 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13]
+        os: [macos-13, macos-14]
 
     steps:
     - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13]
+        os: [macos-13, macos-14]
         manylinux-image: [manylinux2014]
 
     steps:

From ffd7120a6cbddfe5c76b6777631d964d42c1c151 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:30:11 +0200
Subject: [PATCH 13/18] Update test.yml

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 20c9482..4fe22f5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13, macos-14]
+        os: [macos-14]
 
     steps:
     - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13, macos-14]
+        os: [macos-14]
         manylinux-image: [manylinux2014]
 
     steps:
@@ -100,7 +100,7 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
-        CIBW_ARCHS_MACOS: "x86_64 arm64"
+        # CIBW_ARCHS_MACOS: "x86_64 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
         CIBW_BEFORE_ALL_MACOS: brew update && brew reinstall zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"

From cd1c4fb74bbfbd1d1cd438df9977b27ff7eaa0f7 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:37:46 +0200
Subject: [PATCH 14/18] Update test.yml

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4fe22f5..f916f91 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-14]
+        os: [macos-13]
 
     steps:
     - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-14]
+        os: [macos-13]
         manylinux-image: [manylinux2014]
 
     steps:
@@ -100,7 +100,7 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
-        # CIBW_ARCHS_MACOS: "x86_64 arm64"
+        CIBW_ARCHS_MACOS: "arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
         CIBW_BEFORE_ALL_MACOS: brew update && brew reinstall zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"

From f2805fda760b7e196bfbe600eb30663b3ed67560 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 22:46:00 +0200
Subject: [PATCH 15/18] Update test.yml

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f916f91..4b27b62 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13]
+        os: [macos-13, ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13]
+        os: [macos-13, ubuntu-latest]
         manylinux-image: [manylinux2014]
 
     steps:
@@ -100,7 +100,7 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
-        CIBW_ARCHS_MACOS: "arm64"
+        CIBW_ARCHS_MACOS: "x86_64 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
         CIBW_BEFORE_ALL_MACOS: brew update && brew reinstall zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"

From 8375f2698746f82d43b423deb805f3a0d5f57e9e Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 23:07:09 +0200
Subject: [PATCH 16/18] Update _get_zstd.py

The zip file structure changed. The files are now in a subdirectory.
---
 libzstd/_get_zstd.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libzstd/_get_zstd.py b/libzstd/_get_zstd.py
index 5aa5fc0..c571a1f 100644
--- a/libzstd/_get_zstd.py
+++ b/libzstd/_get_zstd.py
@@ -36,13 +36,20 @@
 
 
 with zipfile.ZipFile(io.BytesIO(zip_data)) as zf:
-    INCLUDE_DIR.joinpath("zstd.h").write_bytes(zf.read("include/zstd.h"))
-    LIBRARY_DIR.joinpath("libzstd.dll").write_bytes(zf.read("dll/libzstd.dll"))
+    files = zf.namelist()
+    zstd_h = next((f for f in files if "include/zstd.h" in f), None)
+    libzstd_dll = next((f for f in files if "dll/libzstd.dll" in f), None)
+    libzstd_lib = next((f for f in files if "dll/libzstd.lib" in f), None)
+    libzstd_dll_a = next((f for f in files if "dll/libzstd.dll.a" in f), None)
+
+    INCLUDE_DIR.joinpath("zstd.h").write_bytes(zf.read(zstd_h))
+    LIBRARY_DIR.joinpath("libzstd.dll").write_bytes(zf.read(libzstd_dll))
     try:
-        _libzstd_lib = zf.read("dll/libzstd.lib")
+        _libzstd_lib = zf.read(libzstd_lib)
     except KeyError:
-        _libzstd_lib = zf.read("dll/libzstd.dll.a")
+        _libzstd_lib = zf.read(libzstd_dll_a)
     # this renames libzstd.dll.a to libzstd.lib for setuptools to work
     LIBRARY_DIR.joinpath("libzstd.lib").write_bytes(_libzstd_lib)
 
+
 print("success")

From 78fdd3a787810b7251139ca5725ee3d8765a877e Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 23:07:24 +0200
Subject: [PATCH 17/18] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4b27b62..c107e7a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         # 3.12 was released 2023-10-02 and end-of-life will be 2028-10
         python-version: ['3.8', '3.12']
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13, ubuntu-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         #os: [macos-13, macos-14, ubuntu-latest, windows-latest]
-        os: [macos-13, ubuntu-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         manylinux-image: [manylinux2014]
 
     steps:

From d60020bbde035ab9841e11d0cb808b1380a70199 Mon Sep 17 00:00:00 2001
From: Marco Martinelli <6640057+martinellimarco@users.noreply.github.com>
Date: Sat, 4 May 2024 23:18:10 +0200
Subject: [PATCH 18/18] Update publish.yml

Support for apple silicon
---
 .github/workflows/publish.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7312094..4a8c2e2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         manylinux-image: [manylinux2014]
 
     steps:
@@ -23,12 +23,12 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install Dependencies
       run: |
         python3 -m pip install --upgrade pip
-        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel
+        python3 -m pip install --upgrade-strategy eager --upgrade cython twine cibuildwheel setuptools
 
     - name: Build Tarball
       if: matrix.os == 'ubuntu-latest'
@@ -39,8 +39,9 @@ jobs:
         CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux-image }}
         CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
         CIBW_ARCHS: auto64
+        CIBW_ARCHS_MACOS: "x86_64 arm64"
         CIBW_BEFORE_ALL_LINUX: yum install -y libzstd-devel || apk add zstd-dev
-        CIBW_BEFORE_ALL_MACOS: brew install zstd
+        CIBW_BEFORE_ALL_MACOS: brew update && brew reinstall zstd
         CIBW_BEFORE_BUILD_WINDOWS: "python {package}/libzstd/_get_zstd.py && pip install delvewheel"
         CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
       run: python -m cibuildwheel --output-dir dist
@@ -64,7 +65,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.11'
+        python-version: '3.12'
 
     - name: Install Dependencies
       run: |