From 079c7217b6eb91a6b6282853ccc9593b46de31bd Mon Sep 17 00:00:00 2001 From: Yeicor <4929005+Yeicor@users.noreply.github.com> Date: Sun, 3 Mar 2024 19:57:27 +0100 Subject: [PATCH] improve deploy workflow 3 --- .github/workflows/deploy.yml | 26 +++++--------------------- README.md | 4 ++-- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dda613a..ffa668a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,31 +1,15 @@ name: "maybe deploy" on: - workflow_run: - workflows: [ "build" ] - types: [ "completed" ] - branches: [ "master" ] + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+.*" permissions: contents: "write" jobs: - check-early-exit: - runs-on: "ubuntu-latest" - outputs: - should-deploy: "${{ steps.check-early-exit.outputs.should-deploy }}" - steps: - - run: | - if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then - echo "Not deploying because the CI workflow did not succeed." - echo "should-deploy=false" >> $GITHUB_ENV - elif ! echo "${{ github.ref }}" | grep -q -E "^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+.*"; then - echo "Not deploying because the CI workflow was not triggered by a release tag." - echo "should-deploy=false" >> $GITHUB_ENV - else - echo "should-deploy=true" >> $GITHUB_ENV - fi deploy: concurrency: "ci-${{ github.ref }}" # Recommended if you intend to make multiple deployments in quick succession. runs-on: "ubuntu-latest" @@ -34,12 +18,12 @@ jobs: steps: - uses: "dawidd6/action-download-artifact@v3" with: - workflow: "ci.yml" + workflow: "build" name: "frontend" path: "./public" - uses: "dawidd6/action-download-artifact@v3" with: - workflow: "ci.yml" + workflow: "build" name: "logo" path: "./public" - run: "ls -l -R ./public" diff --git a/README.md b/README.md index 910b050..fe23037 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ in a web browser. - Control clipping planes and transparency of each model. - Select any entity and measure bounding box size and distances. - Fully-featured [static deployment](#static-deployment): just upload the viewer and models to your server. -- [Live lazy updates](#live-updates) while editing the CAD model (using the [yacv_server](yacv_server)). +- [Live lazy updates](#live-updates) while editing the CAD model (using the `yacv-server` package). ## Usage & demo -The latest build is available at https://yeicor-3d.github.io/yet-another-cad-viewer/. +The [logo](yacv_server/logo.py) also works as an example of how to use the viewer. ### Live updates