Automatically update version to 0.6.12

.github/workflows/deploy1.yml

@@ -17,7 +17,14 @@ jobs:
         with: # Ensure we are not in a detached HEAD state
           ref: "master"
       # Check that the tag commit is the latest master commit
-      - run: "[[ $(git rev-parse ${{ github.ref }}) == $(git rev-parse master) ]] || exit 1"
+      - run: |
+          git fetch --tags
+          tag_commit=$(git rev-parse ${{ github.ref }})
+          master_commit=$(git rev-parse master)
+          if [ "$tag_commit" != "$master_commit" ]; then
+              echo "The tag commit ($tag_commit) is not the latest master commit ($master_commit)"
+              exit 1
+          fi
       - run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
       # Write the new version to package.json
       - uses: "actions/setup-node@v4"
@@ -36,7 +43,7 @@ jobs:
           if git commit -am "Automatically update version to $CLEAN_VERSION"; then
             git push
             # Move the tag to the new commit
-            git tag -f -a "$CLEAN_VERSION" -m "$CLEAN_VERSION"
+            git tag -f -a "v$CLEAN_VERSION" -m "v$CLEAN_VERSION"
             git push -f --tags # Force push the tag to GitHub
             # The tag move will NOT trigger a new workflow
           else
@@ -44,8 +51,9 @@ jobs:
             exit 1
           fi
 
-  rebuild: # Makes sure all artifacts are updated and use the new version for the next deployment steps
+  deploy: # Makes sure all artifacts are updated and use the new version for the next deployment steps
     needs: "update-versions"
     uses: "./.github/workflows/deploy2.yml"
+    secrets: "inherit" # Inherit the secrets from the parent workflow
     with:
       ref: "master"  # Ensure we are cloning the latest version of the repository

.github/workflows/deploy2.yml

@@ -32,24 +32,14 @@ jobs:
       name: "github-pages"
       url: "${{ steps.deployment.outputs.page_url }}"
     steps:
-      - uses: "dawidd6/action-download-artifact@v3"
-        with:
-          workflow: "build.yml"
-          name: "frontend"
+      - uses: "actions/download-artifact@v4"
+        with: # Downloads all artifacts from the build job
           path: "./public"
-          allow_forks: false
-      - uses: "dawidd6/action-download-artifact@v3"
-        with:
-          workflow: "build.yml"
-          name: "logo"
-          path: "./public"
-          allow_forks: false
-      - uses: "dawidd6/action-download-artifact@v3"
-        with:
-          workflow: "build.yml"
-          name: "example"
-          path: "./public"
-          allow_forks: false
+      - run: |  # Merge the subdirectories of public into a single directory
+          for dir in public/*; do
+            mv "$dir/"* public/
+            rmdir "$dir"
+          done
       - uses: "actions/configure-pages@v4"
       - uses: "actions/upload-pages-artifact@v3"
         with:
@@ -71,7 +61,15 @@ jobs:
       - uses: "actions/checkout@v4"
         with:
           ref: "${{ inputs.ref }}"
-      - uses: "JRubics/poetry-publish@v2"
+      - uses: "actions/setup-node@v4"
+        with:
+          cache: "yarn"
+      - run: "pipx install poetry"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "3.11"
-          pypi_token: "${{ secrets.PYPI_TOKEN }}"
+          cache: "poetry"
+      - run: "poetry install"
+      - run: "poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}"
+      - run: "poetry publish --build"
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yet-another-cad-viewer",
-  "version": "0.6.5",
+  "version": "0.6.12",
   "description": "",
   "license": "MIT",
   "private": true,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yacv-server"
-version = "0.6.5"
+version = "0.6.12"
 description = "Yet Another CAD Viewer (server)"
 authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
 license = "MIT"