messy env stuff

* Working window.electron.getPath

* Loading project-specific settings in electron tests

* Simplify test until we can get snapshots/traces working in electron tests

* test tweaks

---------

Co-authored-by: Frank Noirot <frank@kittycad.io>

.env.development

@@ -1,5 +1,3 @@
-NODE_ENV=development
-DEV=true
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
       schedule:
           interval: 'daily'
       reviewers:
-          - franknoirot
+          - franknoirot 
           - irev-dev
     - package-ecosystem: 'github-actions' # See documentation for possible values
       directory: '/' # Location of package manifests
@@ -26,3 +26,10 @@ updates:
       reviewers:
           - adamchalmers
           - jessfraz
+    - package-ecosystem: 'cargo' # See documentation for possible values
+      directory: '/src-tauri/' # Location of package manifests
+      schedule:
+          interval: 'daily'
+      reviewers:
+          - adamchalmers
+          - jessfraz

.github/workflows/build-test-publish-apps.yml

@@ -3,8 +3,6 @@ name: build-test-publish-apps
 on:
   pull_request:
   push:
-    branches:
-      - main
   release:
     types: [published]
   schedule:

.github/workflows/build-test-web.yml

@@ -3,18 +3,11 @@ name: build-test-web
 on:
   pull_request:
   push:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-permissions:
-  contents: write
-  pull-requests: write
-  actions: read
-
 jobs:
   check-format:
     runs-on: 'ubuntu-22.04'
@@ -61,7 +54,7 @@ jobs:
 
 
   build-test-web:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
@@ -79,37 +72,5 @@ jobs:
       - run: yarn build:wasm
 
       - run: yarn simpleserver:ci
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
-      - name: Install Chromium Browser
+      - run: yarn test:nowatch
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
-
-      - name: run unit tests
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:nowatch
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-
-      - name: check for changes
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        id: git-check
-        run: |
-            git add src/lang/std/artifactMapGraphs
-            if git status src/lang/std/artifactMapGraphs | grep -q "Changes to be committed"
-            then echo "modified=true" >> $GITHUB_OUTPUT
-            else echo "modified=false" >> $GITHUB_OUTPUT
-            fi
-      - name: Commit changes, if any
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' && steps.git-check.outputs.modified == 'true' }}
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-          git fetch origin
-          echo ${{ github.head_ref }}
-          git checkout ${{ github.head_ref }}
-          # TODO when webkit works on ubuntu remove the os part of the commit message
-          git commit -am "Look at this (photo)Graph *in the voice of Nickelback*" || true
-          git push
-          git push origin ${{ github.head_ref }}

.github/workflows/cargo-clippy.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dir: ['src/wasm-lib']
+        dir: ['src/wasm-lib', 'src-tauri']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
@@ -35,6 +35,24 @@ jobs:
             override: true
             components: clippy
 
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            webkit2gtk-driver \
+            libsoup-3.0-dev \
+            libjavascriptcoregtk-4.1-dev \
+            libwebkit2gtk-4.1-dev \
+            at-spi2-core \
+            xvfb
+          yarn install
+          yarn build:wasm
+          yarn build:local
+
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
 

.github/workflows/cargo-fmt.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dir: ['src/wasm-lib']
+        dir: ['src/wasm-lib', 'src-tauri']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust

.github/workflows/cargo-test-tauri.yml

@@ -0,0 +1,57 @@
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'src-tauri/**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-test-tauri.yml
+  pull_request:
+    paths:
+      - 'src-tauri/**.rs'
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - .github/workflows/cargo-test-tauri.yml
+  workflow_dispatch:
+permissions: read-all
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+name: cargo test of tauri
+jobs:
+  cargotest:
+    name: cargo test
+    runs-on: ubuntu-latest-8-cores
+    strategy:
+      matrix:
+        dir: ['src-tauri']
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libgtk-3-dev \
+            libayatana-appindicator3-dev \
+            webkit2gtk-driver \
+            libsoup-3.0-dev \
+            libjavascriptcoregtk-4.1-dev \
+            libwebkit2gtk-4.1-dev \
+            at-spi2-core \
+            xvfb
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2.6.1
+      - name: cargo test
+        shell: bash
+        run: |-
+          cd "${{ matrix.dir }}"
+          cargo test --all

.github/workflows/playwright.yml

@@ -6,7 +6,7 @@ on:
     branches: [ main ]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
@@ -33,15 +33,14 @@ jobs:
             rust:
               - 'src/wasm-lib/**'
 
-  playwright-chrome:
+  playwright-ubuntu:
-    timeout-minutes: ${{ matrix.os == 'macos-14' && 60 || 40 }}
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
-    runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
     - name: Tune GitHub-hosted runner network
@@ -53,7 +52,6 @@ jobs:
         cache: 'yarn'
     - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
-      shell: bash
       run: yarn
     - name: Cache Playwright Browsers
       uses: actions/cache@v4
@@ -62,7 +60,6 @@ jobs:
           ~/.cache/ms-playwright/
         key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
     - name: Install Playwright Browsers
-      shell: bash
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
@@ -77,7 +74,6 @@ jobs:
         path: src/wasm-lib/pkg
     - name: copy wasm blob
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      shell: bash
       run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
       continue-on-error: true
     - name: Setup Rust
@@ -92,15 +88,7 @@ jobs:
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
-    - name: install good sed
-      if:  ${{ startsWith(matrix.os, 'macos') }}
-      shell: bash
-      run: |
-        brew install gnu-sed
-        echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      shell: bash
-      if:  ${{ !startsWith(matrix.os, 'windows') }}
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
         chmod +x /tmp/vector.sh
@@ -116,39 +104,31 @@ jobs:
         ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
     - name: Build Wasm (because rust diff)
       if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      shell: bash
       run: yarn build:wasm
     - name: OR Build Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
-      shell: bash
       run: yarn build:wasm
     - name: build web
       run: yarn build:local
-      shell: bash
     - name: Run ubuntu/chrome snapshots
-      shell: bash
       run: |
         yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --retries="3" --update-snapshots --grep=@snapshot  --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
       env:
         CI: true
-        NODE_ENV: development
-        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        VITE_KC_SKIP_AUTH: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
     - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
       with:
         name: playwright-report-ubuntu-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
         overwrite: true
     - name: Clean up test-results
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
       continue-on-error: true
       run: rm -r test-results
     - name: check for changes
-      shell: bash
       id: git-check
       run: |
           git add .
@@ -158,7 +138,6 @@ jobs:
           fi
     - name: Commit changes, if any
       if: steps.git-check.outputs.modified == 'true'
-      shell: bash
       run: |
         git add .
         git config --local user.email "github-actions[bot]@users.noreply.github.com"
@@ -167,7 +146,8 @@ jobs:
         git fetch origin
         echo ${{ github.head_ref }}
         git checkout ${{ github.head_ref }}
-        git commit -am "A snapshot a day keeps the bugs away! 📷🐛 (OS: ${{matrix.os}})" || true
+        # TODO when webkit works on ubuntu remove the os part of the commit message
+        git commit -am "A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu)" || true
         git push
         git push origin ${{ github.head_ref }}
     # only upload artifacts if there's actually changes
@@ -177,16 +157,16 @@ jobs:
         name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
+    # if have previous run results, use them
     - uses: actions/download-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
       continue-on-error: true
       with:
         name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
-    - name: Run playwright/chrome flow (with retries)
+    - name: Run ubuntu/chrome flow (with retries)
       id: retry
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
-      shell: bash
       run: |
         if [[ ! -f "test-results/.last-run.json" ]]; then
             # if no last run artifact, than run plawright normally
@@ -232,9 +212,6 @@ jobs:
         exit 0
       env:
         CI: true
-        NODE_ENV: development
-        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        VITE_KC_SKIP_AUTH: true
         token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
     - name: send to axiom
       if: always()
@@ -257,13 +234,14 @@ jobs:
         overwrite: true
 
 
-  playwright-electron:
+  playwright-macos:
+    timeout-minutes: 30
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-14]
+        shardIndex: [1, 2, 3, 4]
-    timeout-minutes: 30
+        shardTotal: [4]
-    runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
     - name: Tune GitHub-hosted runner network
@@ -273,19 +251,18 @@ jobs:
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
-      shell: bash
       run: yarn
     - name: Cache Playwright Browsers
       uses: actions/cache@v4
       with:
         path: |
-          ~/.cache/ms-playwright/
+          ~/.cache/ms-playwright
-        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+        key: ${{ runner.os }}-playwright-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-playwright-
     - name: Install Playwright Browsers
-      shell: bash
+      run: yarn playwright install --with-deps
-      run: yarn playwright install chromium --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
@@ -299,7 +276,6 @@ jobs:
         path: src/wasm-lib/pkg
     - name: copy wasm blob
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      shell: bash
       run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
       continue-on-error: true
     - name: Setup Rust
@@ -314,64 +290,49 @@ jobs:
       uses: Swatinem/rust-cache@v2
       with:
         workspaces: './src/wasm-lib'
-    - name: install good sed
-      if:  ${{ startsWith(matrix.os, 'macos') }}
-      shell: bash
-      run: |
-        brew install gnu-sed
-        echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      if:  ${{ !startsWith(matrix.os, 'windows') }}
-      shell: bash
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
         chmod +x /tmp/vector.sh
         /tmp/vector.sh -y -no-modify-path
         mkdir -p /tmp/vector
         cp .github/workflows/vector.toml /tmp/vector.toml
-        sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+        sed -i "" "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+        sed -i "" "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+        sed -i "" "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-        sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+        sed -i "" "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-        sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+        sed -i "" "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
         cat /tmp/vector.toml
         ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
     - name: Build Wasm (because rust diff)
       if: needs.check-rust-changes.outputs.rust-changed == 'true'
-      shell: bash
       run: yarn build:wasm
     - name: OR Build Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
-      shell: bash
       run: yarn build:wasm
-    - name: build electron
+    - name: build web
-      shell: bash
+      run: yarn build:local
-      run: yarn electron:package
+    # if have previous run results, use them
     - uses: actions/download-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: ${{ always() }}
       continue-on-error: true
       with:
-        name: test-results-ubuntu-${{ github.sha }}
+        name: test-results-macos-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
-    - name: Run electron tests (with retries)
+    - name: Run macos/safari flow (with retries)
       id: retry
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
-      shell: bash
       run: |
         if [[ ! -f "test-results/.last-run.json" ]]; then
             # if no last run artifact, than run plawright normally
             echo "run playwright normally"
-            if [[ "$IS_UBUNTU" == "true" ]]; then
+            yarn playwright test --project="webkit" --config=playwright.ci.config.ts --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --grep-invert="@snapshot|@electron" || true
-              xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
-            else
-              yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
-            fi
             # # send to axiom
             node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
         fi
 
         retry=1
-        max_retrys=2
+        max_retrys=4
 
         # retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
         while [[ $retry -le $max_retrys ]]; do
@@ -380,11 +341,7 @@ jobs:
                 if [[ $failed_tests -gt 0 ]]; then
                     echo "retried=true" >>$GITHUB_OUTPUT
                     echo "run playwright with last failed tests and retry $retry"
-                    if [[ "$IS_UBUNTU" == "true" ]]; then
+                    yarn playwright test --project="webkit" --config=playwright.ci.config.ts --last-failed --grep-invert="@snapshot|@electron" || true
-                      xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
-                    else
-                      yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
-                    fi
                     # send to axiom
                     node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
                     retry=$((retry + 1))
@@ -410,27 +367,171 @@ jobs:
         exit 0
       env:
         CI: true
-        NODE_ENV: development
+        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-        VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
+    - uses: actions/upload-artifact@v4
-        VITE_KC_SKIP_AUTH: true
+      if: ${{ always() }}
-        IS_UBUNTU: ${{ startsWith(matrix.os, 'ubuntu') && 'true' || 'false' }}
+      with:
-        #DEBUG: 'pw:browser*'
+        name: test-results-macos-${{ matrix.shardIndex }}-${{ github.sha }}
+        path: test-results/
+        retention-days: 30
+        overwrite: true
+    - uses: actions/upload-artifact@v4
+      if: ${{ always() }}
+      with:
+        name: playwright-report-macos-${{ matrix.shardIndex }}-${{ github.sha }}
+        path: playwright-report/
+        retention-days: 30
+        overwrite: true
+
+  playwright-electron:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    needs: check-rust-changes
+    steps:
+    - name: Tune GitHub-hosted runner network
+      uses: smorimoto/tune-github-hosted-runner-network@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'yarn'
+    - uses: KittyCAD/action-install-cli@main
+    - name: Install dependencies
+      run: yarn
+    - name: Cache Playwright Browsers
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cache/ms-playwright/
+        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+    - name: Install Playwright Browsers
+      run: yarn playwright install chromium --with-deps
+    - name: Download Wasm Cache
+      id: download-wasm
+      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+      uses: dawidd6/action-download-artifact@v6
+      continue-on-error: true
+      with:
+        github_token: ${{secrets.GITHUB_TOKEN}}
+        name: wasm-bundle
+        workflow: build-and-store-wasm.yml
+        branch: main
+        path: src/wasm-lib/pkg
+    - name: copy wasm blob
+      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
+      continue-on-error: true
+    - name: Setup Rust
+      uses: dtolnay/rust-toolchain@stable
+    - name: Cache Wasm (because rust diff)
+      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: './src/wasm-lib'
+    - name: OR Cache Wasm (because wasm cache failed)
+      if: steps.download-wasm.outcome == 'failure'
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: './src/wasm-lib'
+    - name: Install vector
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
+        chmod +x /tmp/vector.sh
+        /tmp/vector.sh -y -no-modify-path
+        mkdir -p /tmp/vector
+        cp .github/workflows/vector.toml /tmp/vector.toml
+        sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+        sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+        sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+        sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+        sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+        cat /tmp/vector.toml
+        ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
+    - name: Build Wasm (because rust diff)
+      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      run: yarn build:wasm
+    - name: OR Build Wasm (because wasm cache failed)
+      if: steps.download-wasm.outcome == 'failure'
+      run: yarn build:wasm
+    - name: build web
+      run: yarn build:local
+    - uses: actions/download-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: test-results-ubuntu-${{ github.sha }}
+        path: test-results/
+    - name: run electron
+      run: |
+        yarn electron:start > electron.log 2>&1 &
+        while ! grep -q "built in" electron.log; do
+          sleep 1
+        done
+    - name: Run ubuntu/chrome flow (with retries)
+      id: retry
+      if: always()
+      run: |
+        if [[ ! -f "test-results/.last-run.json" ]]; then
+            # if no last run artifact, than run plawright normally
+            echo "run playwright normally"
+            yarn playwright test --project="Google Chrome" --grep=@electron || true
+            # # send to axiom
+            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+        fi
+
+        retry=1
+        max_retrys=4
+
+        # retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
+        while [[ $retry -le $max_retrys ]]; do
+            if [[ -f "test-results/.last-run.json" ]]; then
+                failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+                if [[ $failed_tests -gt 0 ]]; then
+                    echo "retried=true" >>$GITHUB_OUTPUT
+                    echo "run playwright with last failed tests and retry $retry"
+                    yarn playwright test --project="Google Chrome" --last-failed --grep=@electron || true
+                    # send to axiom
+                    node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+                    retry=$((retry + 1))
+                else
+                    echo "retried=false" >>$GITHUB_OUTPUT
+                    exit 0
+                fi
+            else
+                echo "retried=false" >>$GITHUB_OUTPUT
+                exit 0
+            fi
+        done
+
+        echo "retried=false" >>$GITHUB_OUTPUT
+
+        if [[ -f "test-results/.last-run.json" ]]; then
+            failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+            if [[ $failed_tests -gt 0 ]]; then
+                # if it still fails after 3 retrys, then fail the job
+                exit 1
+            fi
+        fi
+        exit 0
+      env:
+        CI: true
+        token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
     - name: send to axiom
-      if: ${{ !cancelled() && (success() || failure()) && !startsWith(matrix.os, 'windows') }}
+      if: always()
       shell: bash
       run: |
         node playwrightProcess.mjs | tee /tmp/github-actions.log
     - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
       with:
         name: test-results-electron-${{ github.sha }}
         path: test-results/
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() && (success() || failure()) }}
+      if: always()
       with:
         name: playwright-report-electron-${{ github.sha }}
         path: playwright-report/
         retention-days: 30
-        overwrite: true
+        overwrite: true

.gitignore

@@ -68,5 +68,4 @@ venv
 out/
 
 src-tauri/target
-electron-test-projects-dir
+electron-test-projects-dir
-electron-test-projects-dir-2

README.md

@@ -110,7 +110,6 @@ Which commands from setup are one off vs need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 ```bash
 yarn install
-yarn wasm-prep
 yarn build:wasm-dev # or yarn build:wasm for slower but more production-like build
 yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```

e2e/playwright/basic-sketch.spec.ts

@@ -84,7 +84,6 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   } else {
     await page.waitForTimeout(500)
   }
-  await page.waitForTimeout(200)
   await page.mouse.click(startXPx, 500 - PUR * 20)
   if (openPanes.includes('code')) {
     await expect(u.codeLocator)
@@ -96,16 +95,15 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   }
 
   // deselect line tool
-  await page.getByTestId('line').click()
+  await page.getByRole('button', { name: 'Line', exact: true }).click()
+  await page.waitForTimeout(500)
 
   const line1 = await u.getSegmentBodyCoords(`[data-overlay-index="${0}"]`, 0)
   if (openPanes.includes('code')) {
-    await expect
+    expect(await u.getGreatestPixDiff(line1, TEST_COLORS.WHITE)).toBeLessThan(3)
-      .poll(async () => u.getGreatestPixDiff(line1, TEST_COLORS.WHITE))
+    await expect(
-      .toBeLessThan(3)
+      await u.getGreatestPixDiff(line1, [249, 249, 249])
-    await expect
+    ).toBeLessThan(3)
-      .poll(() => u.getGreatestPixDiff(line1, [249, 249, 249]))
-      .toBeLessThan(3)
   }
   // click between first two clicks to get center of the line
   await page.mouse.click(startXPx + PUR * 15, 500 - PUR * 10)
@@ -139,8 +137,6 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
 
 test.describe('Basic sketch', () => {
   test('code pane open at start', async ({ page }) => {
-    // Skip on windows it is being weird.
-    test.skip(process.platform === 'win32', 'Skip on windows')
     await doBasicSketch(page, ['code'])
   })
 

e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts

@@ -61,7 +61,7 @@ test.describe('Can create sketches on all planes and their back sides', () => {
     await page.waitForTimeout(300) // wait for animation
 
     await expect(
-      page.getByRole('button', { name: 'line Line', exact: true })
+      page.getByRole('button', { name: 'Line', exact: true })
     ).toBeVisible()
 
     // draw a line
@@ -72,10 +72,7 @@ test.describe('Can create sketches on all planes and their back sides', () => {
 
     await expect(page.locator('.cm-content')).toHaveText(code)
 
-    await page
+    await page.getByRole('button', { name: 'Line', exact: true }).click()
-      .getByRole('button', { name: 'line Line', exact: true })
-      .first()
-      .click()
     await u.openAndClearDebugPanel()
     await page.getByRole('button', { name: 'Exit Sketch' }).click()
     await u.expectCmdLog('[data-message-type="execution-done"]')

e2e/playwright/command-bar-tests.spec.ts

@@ -12,50 +12,47 @@ test.afterEach(async ({ page }, testInfo) => {
 })
 
 test.describe('Command bar tests', () => {
-  // TODO fixme: enter is not working in the command bar
+  test('Extrude from command bar selects extrude line after', async ({
-  test.fixme(
+    page,
-    'Extrude from command bar selects extrude line after',
+  }) => {
-    async ({ page }) => {
+    await page.addInitScript(async () => {
-      await page.addInitScript(async () => {
+      localStorage.setItem(
-        localStorage.setItem(
+        'persistCode',
-          'persistCode',
+        `const sketch001 = startSketchOn('XY')
-          `const sketch001 = startSketchOn('XY')
     |> startProfileAt([-10, -10], %)
     |> line([20, 0], %)
     |> line([0, 20], %)
     |> xLine(-20, %)
     |> close(%)
       `
-        )
-      })
-
-      const u = await getUtils(page)
-      await page.setViewportSize({ width: 1200, height: 500 })
-
-      await u.waitForAuthSkipAppStart()
-
-      await u.openDebugPanel()
-      await u.expectCmdLog('[data-message-type="execution-done"]')
-      await u.closeDebugPanel()
-
-      // Click the line of code for xLine.
-      await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-      await page.waitForTimeout(100)
-
-      await page.getByRole('button', { name: 'Extrude' }).click()
-      await page.waitForTimeout(200)
-      await page.keyboard.press('Enter')
-      await page.waitForTimeout(200)
-      await page.keyboard.press('Enter')
-      await page.waitForTimeout(200)
-      await expect(page.locator('.cm-activeLine')).toHaveText(
-        `const extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
       )
-    }
+    })
-  )
 
-  // TODO fixme: enter is not working in the command bar
+    const u = await getUtils(page)
-  test.fixme('Fillet from command bar', async ({ page }) => {
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    await u.waitForAuthSkipAppStart()
+
+    await u.openDebugPanel()
+    await u.expectCmdLog('[data-message-type="execution-done"]')
+    await u.closeDebugPanel()
+
+    // Click the line of code for xLine.
+    await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+    await page.waitForTimeout(100)
+
+    await page.getByRole('button', { name: 'Extrude' }).click()
+    await page.waitForTimeout(100)
+    await page.keyboard.press('Enter')
+    await page.waitForTimeout(100)
+    await page.keyboard.press('Enter')
+    await page.waitForTimeout(100)
+    await expect(page.locator('.cm-activeLine')).toHaveText(
+      `const extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
+    )
+  })
+
+  test('Fillet from command bar', async ({ page }) => {
     await page.addInitScript(async () => {
       localStorage.setItem(
         'persistCode',
@@ -324,18 +321,20 @@ const extrude001 = extrude(distance001, sketch001)`.replace(
       name: 'rectangle',
     })
     const rectangleToolButton = page.getByRole('button', {
-      name: 'rectangle Corner rectangle',
+      name: 'Corner rectangle',
+      exact: true,
     })
     const lineToolCommand = page.getByRole('option', {
       name: 'Line',
     })
     const lineToolButton = page.getByRole('button', {
-      name: 'line Line',
+      name: 'Line',
       exact: true,
     })
     const arcToolCommand = page.getByRole('option', { name: 'Tangential Arc' })
     const arcToolButton = page.getByRole('button', {
-      name: 'arc Tangential Arc',
+      name: 'Tangential Arc',
+      exact: true,
     })
 
     // Start a sketch

e2e/playwright/editor-tests.spec.ts

@@ -682,6 +682,10 @@ test.describe('Editor tests', () => {
     })
     await page.waitForTimeout(100)
 
+    const startPX = [665, 458]
+
+    const dragPX = 40
+
     await page.getByText('startProfileAt([4.61, -14.01], %)').click()
     await expect(page.getByRole('button', { name: 'Extrude' })).toBeVisible()
     await page.getByRole('button', { name: 'Extrude' }).click()
@@ -689,10 +693,10 @@ test.describe('Editor tests', () => {
     await expect(page.getByTestId('command-bar')).toBeVisible()
     await page.waitForTimeout(100)
 
-    await page.getByRole('button', { name: 'arrow right Continue' }).click()
+    await page.keyboard.press('Enter')
     await page.waitForTimeout(100)
     await expect(page.getByText('Confirm Extrude')).toBeVisible()
-    await page.getByRole('button', { name: 'checkmark Submit command' }).click()
+    await page.keyboard.press('Enter')
     await page.waitForTimeout(100)
 
     // expect the code to have changed

e2e/playwright/electron-setup.spec.ts

@@ -0,0 +1,48 @@
+import test, { _electron } from '@playwright/test'
+import { TEST_SETTINGS_KEY } from './storageStates'
+import { _electron as electron } from '@playwright/test'
+import * as TOML from '@iarna/toml'
+import fs from 'node:fs'
+import { secrets } from './secrets'
+
+test('Electron setup', { tag: '@electron' }, async () => {
+  // create or otherwise clear the folder ./electron-test-projects-dir
+  const fileName = './electron-test-projects-dir'
+  try {
+    fs.rmSync(fileName, { recursive: true })
+  } catch (e) {
+    console.error(e)
+  }
+
+  fs.mkdirSync(fileName)
+
+  // get full path for ./electron-test-projects-dir
+  const fullPath = fs.realpathSync(fileName)
+
+  const electronApp = await electron.launch({
+    args: ['.'],
+  })
+
+  const page = await electronApp.firstWindow()
+
+  // Set local storage directly using evaluate
+  await page.evaluate(
+    (token) => localStorage.setItem('TOKEN_PERSIST_KEY', token),
+    secrets.token
+  )
+
+  // Override settings with electron temporary project directory
+  await page.addInitScript(
+    async ({ settingsKey, settings }) => {
+      localStorage.setItem(settingsKey, settings)
+    },
+    {
+      settingsKey: TEST_SETTINGS_KEY,
+      settings: TOML.stringify({
+        settings: {
+          app: { projectDirectory: fullPath },
+        },
+      }),
+    }
+  )
+})