Merge branch 'main' into cut-release-v0.25.6

KittyCAD · Oct 8, 2024 · eb2eee6 · eb2eee6
2 parents 529ddef + e5c20de
commit eb2eee6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 64 deletions.
diff --git a/.github/workflows/build-test-publish-apps.yml b/.github/workflows/build-test-publish-apps.yml
@@ -51,6 +51,8 @@ jobs:
         run: |
           VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
 
+      # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
+
       - uses: actions/upload-artifact@v3
         with:
           name: prepared-files
@@ -61,25 +63,12 @@ jobs:
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
-      - name: Prepare electron-builder.yml file for nightly
-        if: ${{ github.event_name == 'schedule' }}
-        run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/nightly"' electron-builder.yml
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ github.event_name == 'schedule' }}
-        with:
-          name: prepared-files-nightly
-          path: |
-            electron-builder.yml
-
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
           yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
           name: prepared-files-updater-test
           path: |
@@ -119,16 +108,6 @@ jobs:
           mkdir src/wasm-lib/pkg
           cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
 
-      - uses: actions/download-artifact@v3
-        if: ${{ github.event_name == 'schedule' }}
-        name: prepared-files-nightly
-
-      - name: Copy updated electron-builder.yml file for nightly build
-        if: ${{ github.event_name == 'schedule' }}
-        run: |
-          ls -R prepared-files-nightly
-          cp prepared-files-nightly/electron-builder.yml electron-builder.yml
-
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
         with:
@@ -173,17 +152,11 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         with:
-          name: out-arm64-${{ matrix.os }}
+          name: out-${{ matrix.os }}
           path: |
-            out/Zoo*arm64*.*
+            out/Zoo*.*
             out/latest*.yml
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: out-x64-${{ matrix.os }}
-          path: |
-            out/Zoo*x*64*.*
-
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
       - uses: actions/download-artifact@v3
@@ -203,16 +176,10 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-arm64-${{ matrix.os }}
+          name: updater-test-${{ matrix.os }}
           path: |
-            out/Zoo*arm64*.*
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        with:
-          name: updater-test-x64-${{ matrix.os }}
-          path: |
-            out/Zoo*x64*.*
+            out/Zoo*.*
+            out/latest*.yml
 
 
   publish-apps-release:
@@ -234,32 +201,17 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-windows-2022
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-windows-2022
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-arm64-macos-14
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-macos-14
+          name: out-windows-2022
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-ubuntu-22.04
+          name: out-macos-14
           path: out
 
       - uses: actions/download-artifact@v3
         with:
-          name: out-x64-ubuntu-22.04
+          name: out-ubuntu-22.04
           path: out
 
       - name: Generate the download static endpoint

diff --git a/src/wasm-lib/Cargo.lock b/src/wasm-lib/Cargo.lock
diff --git a/src/wasm-lib/derive-docs/Cargo.toml b/src/wasm-lib/derive-docs/Cargo.toml
@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 Inflector = "0.11.4"
 convert_case = "0.6.0"
-once_cell = "1.19.0"
+once_cell = "1.20.2"
 proc-macro2 = "1"
 quote = "1"
 regex = "1.10"