Automatically update version to 0.10.5

.github/workflows/deploy1.yml

@@ -18,13 +18,14 @@ jobs:
           ref: "master"
           token: "${{ secrets.GH_PAT }}"
       # Check that the tag commit is the latest master commit
-      - run: |
+      - id: check_recursive
+        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
+              echo "::warning ::The tag commit $tag_commit does not match the latest master commit $master_commit. This is probably a recursive tag push that will be ignored."
+              echo "skip=true" >> $GITHUB_OUTPUT
           fi
       - run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
       # Write the new version to package.json
@@ -38,7 +39,8 @@ jobs:
           cache: "poetry"
       - run: "poetry version $CLEAN_VERSION"
       # Commit the changes and move the tag!
-      - run: |
+      - if: "steps.check_recursive.outputs.skip != 'true'"
+        run: |
           git config --global user.email "yeicor@users.noreply.github.com"
           git config --global user.name "Yeicor"
           if git commit -am "Automatically update version to $CLEAN_VERSION"; then

frontend/tools/PlaygroundDialogContent.vue

@@ -113,6 +113,7 @@ async function runCode() {
   } catch (e) {
     output(`Error running code: ${e}\n`);
   } finally {
+    output("Code execution finished.\n");
     running.value = false; // Indicate that Pyodide is ready
   }
 }

frontend/tools/upload-file.ts

@@ -1,4 +1,7 @@
-import { encrypt } from "tanmayo7lock";
+(globalThis as any).process = (globalThis as any).process || {};
+(globalThis as any).process.env = (globalThis as any).env || {};
+(globalThis as any).process.env.LOCK_SECRET = (globalThis as any).process.env.LOCK_SECRET || "hudfhgd8fghdfgh3uhuifdgh"; // Shhh, this is a secret key for the vouz.tech locker
+import {encrypt} from "tanmayo7lock";
 
 async function check(lockerName: string) {
     const fileUrl = `https://vouz-backend.onrender.com/api/check_key`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yet-another-cad-viewer",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "",
   "license": "MIT",
   "private": true,
@@ -28,7 +28,7 @@
     "pako": "^2.1.0",
     "pyodide": "^0.28.0",
     "tanmayo7lock": "^1.0.18",
-    "three": "^0.178.0",
+    "three": "^0.179.0",
     "three-mesh-bvh": "^0.9.0",
     "three-orientation-gizmo": "git+https://github.com/jrj2211/three-orientation-gizmo.git",
     "vue": "^3.5.13",

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "yacv-server"
-version = "0.10.4"
+version = "0.10.5"
 description = "Yet Another CAD Viewer (server)"
 authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
 license = "MIT"

vite.config.ts

@@ -62,12 +62,7 @@ export default defineConfig({
         __APP_VERSION__: JSON.stringify(version),
         __APP_GIT_SHA__: JSON.stringify(execSync('git rev-parse HEAD').toString().trim()),
         __APP_GIT_DIRTY__: JSON.stringify(execSync('git diff --quiet || echo dirty').toString().trim()),
-        __YACV_SMALL_BUILD__: JSON.stringify(wantsSmallBuild),
-        process: {
-            env: {
-                LOCK_SECRET: "hudfhgd8fghdfgh3uhuifdgh" // Shhh, this is a secret key for the vouz.tech locker
-            }
-        }
+        __YACV_SMALL_BUILD__: JSON.stringify(wantsSmallBuild)
     }
 })
 

yarn.lock

@@ -2974,10 +2974,10 @@ three@^0.125.0:
   resolved "https://registry.yarnpkg.com/three/-/three-0.125.2.tgz#dcba12749a2eb41522e15212b919cd3fbf729b12"
   integrity sha512-7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA==
 
-three@^0.178.0:
-  version "0.178.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.178.0.tgz#470fb4bc35bc0782dfe9a2c9b157fcbc1944bc44"
-  integrity sha512-ybFIB0+x8mz0wnZgSGy2MO/WCO6xZhQSZnmfytSPyNpM0sBafGRVhdaj+erYh5U+RhQOAg/eXqw5uVDiM2BjhQ==
+three@^0.179.0:
+  version "0.179.1"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.179.1.tgz#6c0b43e046eaad0f42b163143517a44ae44ed446"
+  integrity sha512-5y/elSIQbrvKOISxpwXCR4sQqHtGiOI+MKLc3SsBdDXA2hz3Mdp3X59aUp8DyybMa34aeBwbFTpdoLJaUDEWSw==
 
 tinyglobby@^0.2.12, tinyglobby@^0.2.14:
   version "0.2.14"