From 74b6090aaf7da8ba3375d783daf168b0551ed989 Mon Sep 17 00:00:00 2001
From: Mike Schmidt <schmidmt@gmail.com>
Date: Tue, 13 Feb 2024 08:34:04 -0700
Subject: [PATCH] chore: Updated github actions to use upload-artifact/merge@4

---
 .github/workflows/python-build-test.yaml | 22 ++++++++++++++++------
 pylace/Cargo.lock                        | 18 +++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/python-build-test.yaml b/.github/workflows/python-build-test.yaml
index bfea5539..fcb2f5f8 100644
--- a/.github/workflows/python-build-test.yaml
+++ b/.github/workflows/python-build-test.yaml
@@ -124,7 +124,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux-${{ matrix.runs-on }}
           path: dist
 
   windows:
@@ -168,7 +168,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-windows-${{ matrix.runs-on }}
           path: dist
 
   macos:
@@ -213,13 +213,23 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-macos-${{ matrix.runs-on }}
           path: dist
 
+  merge:
+    runs-on: ubuntu-latest
+    needs: [ macos, windows, linux ]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifacts/merge@v4
+        with:
+          name: wheels
+          pattern: wheels-*
+
   test-mdbook-python:
     name: Test MDBook Python Snippets
     runs-on: ubuntu-latest
-    needs: [linux]
+    needs: [merge]
     steps:
       - uses: actions/checkout@v4
 
@@ -253,7 +263,7 @@ jobs:
   test-mdbook-build:
     name: Test MDBook Building
     runs-on: ubuntu-latest
-    needs: [linux]
+    needs: [merge]
     steps:
       - uses: actions/checkout@v4
 
@@ -287,7 +297,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     if: startsWith(github.ref, 'refs/tags/python-')
-    needs: [linux, windows, macos, test-mdbook-python, test-mdbook-build]
+    needs: [merge, test-mdbook-python, test-mdbook-build]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/pylace/Cargo.lock b/pylace/Cargo.lock
index 98b41b7a..2f8e8ed9 100644
--- a/pylace/Cargo.lock
+++ b/pylace/Cargo.lock
@@ -521,7 +521,7 @@ dependencies = [
 
 [[package]]
 name = "lace"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "dirs",
  "indexmap",
@@ -549,7 +549,7 @@ dependencies = [
 
 [[package]]
 name = "lace_cc"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "enum_dispatch",
  "itertools",
@@ -569,7 +569,7 @@ dependencies = [
 
 [[package]]
 name = "lace_codebook"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "lace_consts",
  "lace_data",
@@ -590,7 +590,7 @@ dependencies = [
 
 [[package]]
 name = "lace_data"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "lace_utils",
  "serde",
@@ -599,7 +599,7 @@ dependencies = [
 
 [[package]]
 name = "lace_geweke"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "indicatif",
  "lace_stats",
@@ -611,7 +611,7 @@ dependencies = [
 
 [[package]]
 name = "lace_metadata"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "bincode",
  "hex",
@@ -630,7 +630,7 @@ dependencies = [
 
 [[package]]
 name = "lace_stats"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "itertools",
  "lace_consts",
@@ -644,7 +644,7 @@ dependencies = [
 
 [[package]]
 name = "lace_utils"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rand",
  "rayon",
@@ -1345,7 +1345,7 @@ checksum = "fe7765e19fb2ba6fd4373b8d90399f5321683ea7c11b598c6bbaa3a72e9c83b8"
 
 [[package]]
 name = "pylace"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "lace",
  "lace_utils",