Automatically update version to 0.6.9

.github/workflows/deploy1.yml

@@ -3,7 +3,7 @@ on:
     tags:
       - "v**"
 
-permissions:  # Same as deploy2.yml
+permissions: # Same as deploy2.yml
   contents: "write"
   pages: "write"
   id-token: "write"
@@ -14,6 +14,17 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v4"
+        with: # Ensure we are not in a detached HEAD state
+          ref: "master"
+      # Check that the tag commit is the latest master commit
+      - 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"
@@ -32,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 "$VERSION" -m "$VERSION"
+            git tag -f -a "$CLEAN_VERSION" -m "$CLEAN_VERSION"
             git push -f --tags # Force push the tag to GitHub
             # The tag move will NOT trigger a new workflow
           else
@@ -40,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

@@ -71,7 +71,10 @@ jobs:
       - uses: "actions/checkout@v4"
         with:
           ref: "${{ inputs.ref }}"
-      - uses: "JRubics/poetry-publish@v2"
+      - uses: "actions/setup-node@v4"
         with:
-          python-version: "3.11"
+          cache: "yarn"
+      - uses: "JRubics/poetry-publish@v2.0"
+        with:
+          python_version: "3.11"
           pypi_token: "${{ secrets.PYPI_TOKEN }}"

package.json

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

pyproject.toml

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