Merge branch 'main' into franknoirot/adhoc/lengthen-code-timeout-onboarding-tests

These tests work without fail locally so I have to believe this is due
to some slowness in startup on MacOS.

.github/workflows/build-apps.yml

@@ -10,8 +10,7 @@ on:
       - 'nightly-v[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  # IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
+  IS_RELEASE: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
-  IS_RELEASE: true
   IS_NIGHTLY: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'nightly-v') }}
 
 concurrency:
@@ -100,11 +99,11 @@ jobs:
           yarn files:set-version
           yarn files:flip-to-nightly
 
-      # - name: Set release version
+      - name: Set release version
-      #   if: ${{ env.IS_RELEASE == 'true' }}
+        if: ${{ env.IS_RELEASE == 'true' }}
-      #   run: |
+        run: |
-      #     export VERSION=${GITHUB_REF_NAME#v}
+          export VERSION=${GITHUB_REF_NAME#v}
-      #     yarn files:set-version
+          yarn files:set-version
 
       - uses: actions/upload-artifact@v4
         with:
@@ -184,32 +183,30 @@ jobs:
           max_attempts: 3
           command: yarn install
 
-      # Next steps are from Digicert docs at
-      # https://docs.digicert.com/en/digicert-keylocker/ci-cd-integrations/scripts/github/scripts-for-signing-using-ksp-library-on-github.html#ksp-signing-using-github-action-488726
       - name: Prepare certificate and variables (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
         run: |
-          CERTIFICATE_PATH=$RUNNER_TEMP/certificate.p12
+          echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
-          echo "$SM_CLIENT_CERT_FILE_B64" | base64 --decode > $CERTIFICATE_PATH
+          cat /d/Certificate_pkcs12.p12
-          echo "SM_CLIENT_CERT_FILE=$CERTIFICATE_PATH" >> "$GITHUB_ENV"
+          echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
           echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
           echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
+          echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
           echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
           echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
           echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
-          echo "C:\Program Files\DigiCert\DigiCert Keylocker Tools" >> $GITHUB_PATH
+          echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
         run: |
-          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/Keylockertools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o Keylockertools-windows-x64.msi
+          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
-          msiexec /i Keylockertools-windows-x64.msi /quiet /qn
+          msiexec /i smtools-windows-x64.msi /quiet /qn
           smksp_registrar.exe list
           smctl.exe keypair ls
           C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
           smksp_cert_sync.exe
-          smctl windows certsync
         shell: cmd
 
       - name: Build the app (debug)
@@ -228,8 +225,8 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          # DEBUG: "electron-notarize*"
+          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-          DEBUG: electron-builder
+          DEBUG: "electron-notarize*"
         # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
         uses: nick-fields/retry@v3.0.2
         with:

e2e/playwright/onboarding-tests.spec.ts

@@ -48,7 +48,10 @@ test.describe('Onboarding tests', () => {
     await expect(page.getByText('Welcome to Design Studio! This')).toBeVisible()
 
     // *and* that the code is shown in the editor
-    await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
+    await expect(page.locator('.cm-content')).toContainText(
+      '// Shelf Bracket',
+      { timeout: 10_000 }
+    )
 
     // Make sure the model loaded
     const XYPlanePoint = { x: 774, y: 116 } as const
@@ -91,7 +94,8 @@ test.describe('Onboarding tests', () => {
 
         // *and* that the code is shown in the editor
         await expect(page.locator('.cm-content')).toContainText(
-          '// Shelf Bracket'
+          '// Shelf Bracket',
+          { timeout: 10_000 }
         )
 
         // TODO: jess make less shit

electron-builder.yml

@@ -33,12 +33,10 @@ win:
         - x64
         - arm64
   signtoolOptions:
-    certificateSha1: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
+    sign: "./scripts/sign-win.js"
     signingHashAlgorithms:
       - sha256
-    publisherName: "KittyCAD Inc"
+    publisherName: "KittyCAD Inc" # needs to be exactly like on Digicert
-    certificateSubjectName: "KittyCAD Inc"
-    rfc3161TimeStampServer: http://timestamp.digicert.com
   icon: "assets/icon.ico"
   fileAssociations:
     - ext: kcl

scripts/sign-win.js

@@ -0,0 +1,37 @@
+// From https://github.com/OpenBuilds/OpenBuilds-CONTROL/blob/4800540ffaa517925fc2cff26670809efa341ffe/signWin.js
+const { execSync } = require('node:child_process')
+
+exports.default = async (configuration) => {
+  if (!process.env.SM_API_KEY) {
+    console.error(
+      'Signing using signWin.js script: failed: SM_API_KEY ENV VAR NOT FOUND'
+    )
+    return
+  }
+
+  if (!process.env.WINDOWS_CERTIFICATE_THUMBPRINT) {
+    console.error(
+      'Signing using signWin.js script: failed: FINGERPRINT ENV VAR NOT FOUND'
+    )
+    return
+  }
+
+  if (!configuration.path) {
+    throw new Error(
+      `Signing using signWin.js script: failed: TARGET PATH NOT FOUND`
+    )
+  }
+
+  try {
+    execSync(
+      `smctl sign --fingerprint="${process.env.WINDOWS_CERTIFICATE_THUMBPRINT
+      }" --input "${String(configuration.path)}"`,
+      {
+        stdio: 'inherit',
+      }
+    )
+    console.log('Signing using signWin.js script: successful')
+  } catch (error) {
+    throw new Error('Signing using signWin.js script: failed:', error)
+  }
+}