Skip to content

Commit

Permalink
Fix action (#1059)
Browse files Browse the repository at this point in the history
* archs default to native, no need to specify x86_64

* limit artifact search and add dependency
  • Loading branch information
pca006132 authored Nov 18, 2024
1 parent f22435f commit a557225
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Deploy documentation

on:
push:
branches:
- master
workflow_run:
workflows: [CI]
types:
- completed
branches: [master]

jobs:
deploy_github_pages:
Expand All @@ -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
Expand All @@ -44,4 +50,4 @@ jobs:
publish_branch: gh-pages
force_orphan: true
cname: manifoldcad.org
publish_dir: ./public
publish_dir: ./public
6 changes: 4 additions & 2 deletions .github/workflows/publish_npm.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: publish_npm

on:
on:
release:
types: [published]
workflow_dispatch:
Expand All @@ -23,6 +23,8 @@ jobs:
with:
workflow: manifold.yml
workflow_conclusion: completed
branch: master
check_artifact: true
name: wasm
path: ./bindings/wasm/

Expand All @@ -31,4 +33,4 @@ jobs:
cd ./bindings/wasm/
npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit a557225

Please sign in to comment.