From 43a25c29e0cc59d6671e624cbdaa746fdb9ae29f Mon Sep 17 00:00:00 2001
From: Kyle Barron <kylebarron2@gmail.com>
Date: Sun, 23 Jun 2024 11:52:38 -0400
Subject: [PATCH 1/4] wheels for all packages

---
 .github/workflows/wheels.yml | 22 ++++++++++++++++++----
 Cargo.toml                   |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ff642a2..d660956 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -34,6 +34,9 @@ jobs:
             target: s390x
           - runner: ubuntu-latest
             target: ppc64le
+        cargo_path:
+          - arro3-core/Cargo.toml
+          - arro3-compute/Cargo.toml
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -43,7 +46,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
           sccache: "true"
           manylinux: auto
       - name: Upload wheels
@@ -61,6 +64,9 @@ jobs:
             target: x64
           - runner: windows-latest
             target: x86
+        cargo_path:
+          - arro3-core/Cargo.toml
+          - arro3-compute/Cargo.toml
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -71,7 +77,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -88,6 +94,9 @@ jobs:
             target: x86_64
           - runner: macos-14
             target: aarch64
+        cargo_path:
+          - arro3-core/Cargo.toml
+          - arro3-compute/Cargo.toml
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -97,7 +106,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path arro3-core/Cargo.toml
+          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -107,13 +116,18 @@ jobs:
 
   sdist:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        cargo_path:
+          - arro3-core/Cargo.toml
+          - arro3-compute/Cargo.toml
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
-          args: --out dist --manifest-path arro3-core/Cargo.toml
+          args: --out dist --manifest-path ${{ matrix.cargo_path }}
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
diff --git a/Cargo.toml b/Cargo.toml
index 60f2828..9145945 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 members = ["arro3-compute", "arro3-core", "arro3-internal"]
+resolver = "2"
 
 [workspace.dependencies]
 arrow = { version = "52", features = ["ffi"] }

From 06cfe748f41d05c0857eaa9fea50ef83d371b78f Mon Sep 17 00:00:00 2001
From: Kyle Barron <kylebarron2@gmail.com>
Date: Sun, 23 Jun 2024 11:54:28 -0400
Subject: [PATCH 2/4] Rename wheels ci file

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

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d660956..f74df28 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -1,9 +1,9 @@
-# This file is autogenerated by maturin v1.5.1
+# This file is (mostly) autogenerated by maturin v1.5.1
 # To update, run
 #
 #    maturin generate-ci github -m arro3-core/Cargo.toml
 #
-name: CI
+name: Build wheels
 
 on:
   push:

From 0554b0513c56cbd674e61224dae069653e2dbb0a Mon Sep 17 00:00:00 2001
From: Kyle Barron <kylebarron2@gmail.com>
Date: Sun, 23 Jun 2024 12:05:35 -0400
Subject: [PATCH 3/4] separate uploads

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

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index f74df28..5f675e3 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.platform.target }}
+          name: wheels-linux-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
           path: dist
 
   windows:
@@ -82,7 +82,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.platform.target }}
+          name: wheels-windows-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
           path: dist
 
   macos:
@@ -111,7 +111,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.platform.target }}
+          name: wheels-macos-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
           path: dist
 
   sdist:
@@ -131,7 +131,7 @@ jobs:
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-sdist
+          name: wheels-sdist-${{ matrix.cargo_path }}
           path: dist
 
   # release:

From 19a6831b5a0e30ae27710e8d3b4b6065e937d767 Mon Sep 17 00:00:00 2001
From: Kyle Barron <kylebarron2@gmail.com>
Date: Sun, 23 Jun 2024 12:09:26 -0400
Subject: [PATCH 4/4] prevent / in filename

---
 .github/workflows/wheels.yml | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 5f675e3..113f574 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -34,9 +34,9 @@ jobs:
             target: s390x
           - runner: ubuntu-latest
             target: ppc64le
-        cargo_path:
-          - arro3-core/Cargo.toml
-          - arro3-compute/Cargo.toml
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -46,13 +46,13 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
           manylinux: auto
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
+          name: wheels-linux-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   windows:
@@ -64,9 +64,9 @@ jobs:
             target: x64
           - runner: windows-latest
             target: x86
-        cargo_path:
-          - arro3-core/Cargo.toml
-          - arro3-compute/Cargo.toml
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -77,12 +77,12 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
+          name: wheels-windows-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   macos:
@@ -94,9 +94,9 @@ jobs:
             target: x86_64
           - runner: macos-14
             target: aarch64
-        cargo_path:
-          - arro3-core/Cargo.toml
-          - arro3-compute/Cargo.toml
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -106,32 +106,32 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --manifest-path ${{ matrix.cargo_path }}
+          args: --release --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.platform.target }}-${{ matrix.cargo_path }}
+          name: wheels-macos-${{ matrix.platform.target }}-${{ matrix.module }}
           path: dist
 
   sdist:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        cargo_path:
-          - arro3-core/Cargo.toml
-          - arro3-compute/Cargo.toml
+        module:
+          - arro3-core
+          - arro3-compute
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
-          args: --out dist --manifest-path ${{ matrix.cargo_path }}
+          args: --out dist --manifest-path ${{ matrix.module }}/Cargo.toml
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-sdist-${{ matrix.cargo_path }}
+          name: wheels-sdist-${{ matrix.module }}
           path: dist
 
   # release: