From a557225c294c67ab2e4f3663e5eb775c75ea87ee Mon Sep 17 00:00:00 2001
From: pca006132 <john.lck40@gmail.com>
Date: Tue, 19 Nov 2024 00:41:42 +0800
Subject: [PATCH] Fix action (#1059)

* archs default to native, no need to specify x86_64

* limit artifact search and add dependency
---
 .github/workflows/build_wheels.yml |  2 --
 .github/workflows/deploy.yml       | 18 ++++++++++++------
 .github/workflows/publish_npm.yml  |  6 ++++--
 pyproject.toml                     |  1 -
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index fa6290d81..290d1705c 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -18,8 +18,6 @@ jobs:
       - run: |
           git config --global submodule.fetchJobs 8
           git config --global core.longpaths true
-      - if: matrix.os == 'macos-13'
-        run: echo "CIBW_ARCHS=x86_64" >> "$GITHUB_ENV"
       - if: matrix.os == 'macos-14'
         run: echo "CIBW_ARCHS=arm64 universal2" >> "$GITHUB_ENV"
       - uses: actions/checkout@v4
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ca03f9683..f0c230093 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,9 +1,11 @@
 name: Deploy documentation 
 
 on:
-  push:
-    branches:
-      - master
+  workflow_run:
+    workflows: [CI]
+    types:
+      - completed
+    branches: [master]
 
 jobs:
   deploy_github_pages:
@@ -26,10 +28,14 @@ jobs:
       with:
         workflow: manifold.yml
         workflow_conclusion: completed
-        event: push
+        branch: maser
+        # specific to the triggering workflow
+        run_id: ${{github.event.workflow_run.id}}
+        # do not download from old run
+        check_artifacts: true 
         name: wasm
         path: ./public
-        
+
     - name: Deploy Javascript Docs to Github Pages
       run: |
         cd bindings/wasm
@@ -44,4 +50,4 @@ jobs:
         publish_branch: gh-pages
         force_orphan: true
         cname: manifoldcad.org
-        publish_dir: ./public
\ No newline at end of file
+        publish_dir: ./public
diff --git a/.github/workflows/publish_npm.yml b/.github/workflows/publish_npm.yml
index 2f2a19a7a..00b212c0a 100644
--- a/.github/workflows/publish_npm.yml
+++ b/.github/workflows/publish_npm.yml
@@ -1,6 +1,6 @@
 name: publish_npm
 
-on: 
+on:
   release:
     types: [published]
   workflow_dispatch:
@@ -23,6 +23,8 @@ jobs:
       with:
         workflow: manifold.yml
         workflow_conclusion: completed
+        branch: master
+        check_artifact: true
         name: wasm
         path: ./bindings/wasm/
 
@@ -31,4 +33,4 @@ jobs:
         cd ./bindings/wasm/
         npm publish
       env:
-        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
\ No newline at end of file
+        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
diff --git a/pyproject.toml b/pyproject.toml
index fe2c47766..c201b700a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -63,7 +63,6 @@ before-all = "git clone --depth 1 --branch v2021.10.0 https://github.com/oneapi-
 "cmake.define.FETCHCONTENT_UPDATES_DISCONNECTED" = "ON"
 
 [tool.cibuildwheel.macos]
-archs = ["x86_64", "arm64", "universal2"]
 environment = "MACOSX_DEPLOYMENT_TARGET=10.14"
 
 [tool.cibuildwheel.windows]