From 2541f64dc6b6034156aec5c7dc4a343ec8cbb096 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 27 May 2026 01:12:51 -0700
Subject: [PATCH] Fix Windows release publish command (#2905)

---
 .github/workflows/release-cut.yml             |  2 +-
 ...package-electron-runtime-contract.test.mjs | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-cut.yml b/.github/workflows/release-cut.yml
index cf9ab52b96a..1f8aba5b043 100644
--- a/.github/workflows/release-cut.yml
+++ b/.github/workflows/release-cut.yml
@@ -467,7 +467,7 @@ jobs:
               ~/Library/Caches/electron-builder
           - os: windows-latest
             platform: win
-            release_command: node config/scripts/ensure-native-runtime.mjs --runtime=electron && pnpm exec electron-builder --config config/electron-builder.config.cjs --win --publish always
+            release_command: 'node config/scripts/ensure-native-runtime.mjs --runtime=electron; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }; pnpm exec electron-builder --config config/electron-builder.config.cjs --win --publish always'
             eb_cache_path: |
               ~\AppData\Local\electron\Cache
               ~\AppData\Local\electron-builder\Cache
diff --git a/config/scripts/package-electron-runtime-contract.test.mjs b/config/scripts/package-electron-runtime-contract.test.mjs
index aa27cac1371..8a52e7bb406 100644
--- a/config/scripts/package-electron-runtime-contract.test.mjs
+++ b/config/scripts/package-electron-runtime-contract.test.mjs
@@ -2,6 +2,7 @@ import { readFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
+import { parse } from 'yaml'
 
 const projectDir = resolve(dirname(fileURLToPath(import.meta.url)), '../..')
 const packageJson = JSON.parse(readFileSync(join(projectDir, 'package.json'), 'utf8'))
@@ -34,14 +35,24 @@ describe('Electron runtime package contract', () => {
 
   it('guards release publishing before electron-builder runs', () => {
     const releaseWorkflow = readFileSync(join(projectDir, '.github/workflows/release-cut.yml'), 'utf8')
-    const releaseCommands = [...releaseWorkflow.matchAll(/release_command:\s*(.+)/g)].map(
-      ([, command]) => command
+    const parsedWorkflow = parse(releaseWorkflow)
+    const releaseCommands = new Map(
+      parsedWorkflow.jobs.build.strategy.matrix.include.map(({ platform, release_command }) => [
+        platform,
+        release_command
+      ])
     )
 
-    expect(releaseCommands).toHaveLength(3)
-    for (const command of releaseCommands) {
-      expect(command).toMatch(/^node config\/scripts\/ensure-native-runtime\.mjs --runtime=electron && /)
+    expect([...releaseCommands.keys()].sort()).toEqual(['linux', 'mac', 'win'])
+    for (const command of releaseCommands.values()) {
+      expect(command).toContain('node config/scripts/ensure-native-runtime.mjs --runtime=electron')
       expect(command).toContain('electron-builder')
+      expect(command.indexOf('ensure-native-runtime')).toBeLessThan(command.indexOf('electron-builder'))
     }
+    expect(releaseCommands.get('mac')).toContain(' && ORCA_MAC_RELEASE=1 ')
+    expect(releaseCommands.get('linux')).toContain(' && pnpm exec electron-builder ')
+    expect(releaseCommands.get('win')).toContain(
+      '; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }; pnpm exec electron-builder '
+    )
   })
 })