From 5d06339cb0c73212c2ea78f58b86a77696f6ecbf Mon Sep 17 00:00:00 2001
From: Martin Stancsics <martin.stancsics@quantco.com>
Date: Thu, 30 Jan 2025 09:47:45 +0100
Subject: [PATCH 1/3] Build linux-aarch64 wheels on native arm machine

---
 .github/workflows/build-wheels.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index cfb94f4e..33436b0c 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -12,28 +12,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
+        os: [ubuntu-22.04, ubuntu-22.04, windows-2019, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
-          image: tonistiigi/binfmt:qemu-v8.1.5
       - name: Set up micromamba
         uses: mamba-org/setup-micromamba@0dea6379afdaffa5d528b3d1dabc45da37f443fc
       - name: Build wheels
-        if: github.event_name != 'release'
-        uses: pypa/cibuildwheel@v2.22.0
-        env:
-          CIBW_ARCHS_LINUX: auto
-      - name: Build wheels (release)
-        if: github.event_name == 'release' && github.event.action == 'published'
         uses: pypa/cibuildwheel@v2.22.0
-        env:
-          CIBW_ARCHS_LINUX: x86_64 aarch64
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}

From 5a57bca0ede637b46f6476bc414c78399e69400c Mon Sep 17 00:00:00 2001
From: Martin Stancsics <martin.stancsics@quantco.com>
Date: Thu, 30 Jan 2025 09:49:55 +0100
Subject: [PATCH 2/3] Harmonize CI triggers across workflows

---
 .github/workflows/build-wheels.yml |  5 +++++
 .github/workflows/conda-build.yml  | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 33436b0c..1e48d736 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -2,6 +2,11 @@ name: Build and upload to PyPI
 
 on:
   pull_request:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "*"
   release:
     types:
       - published
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
index 54245abe..9d62e97e 100644
--- a/.github/workflows/conda-build.yml
+++ b/.github/workflows/conda-build.yml
@@ -1,11 +1,15 @@
 name: conda-build
 on:
+  # We would like to trigger for CI for any pull request action -
+  # both from QuantCo's branches as well as forks.
   pull_request:
-    branches:
-      - main
+  # In addition to pull requests, we want to run CI for pushes
+  # to the main branch and tags.
   push:
     branches:
-      - main
+      - "main"
+    tags:
+      - "*"
 
 jobs:
   conda-build:

From a2ae5fc155cb8a43cebdb7acf79c664d49e9f6e9 Mon Sep 17 00:00:00 2001
From: Martin Stancsics <martin.stancsics@quantco.com>
Date: Thu, 30 Jan 2025 09:53:58 +0100
Subject: [PATCH 3/3] Oops

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

diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
index 1e48d736..c0321728 100644
--- a/.github/workflows/build-wheels.yml
+++ b/.github/workflows/build-wheels.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04, windows-2019, macos-13, macos-14]
+        os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2019, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4