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}}