ci: workflow and build script improvements for macOS and Yarn 4.12.0 support

- Set up robust GitHub Actions workflow with XDG_CACHE_HOME for consistent caching
- Clean electron-output before builds to prevent corruption
- Use yarn exec for proper Yarn workspace binary resolution
- Fix workflow conditional syntax for secrets checks
- Update packageManager to yarn@4.12.0 in package.json
- Add prep-build-binary.cjs wrapper script with fallback logic (npx → yarn exec → local)

Author: dedicatedbroadcastsolutions

.github/workflows/node.yaml

@@ -35,6 +35,12 @@ jobs:
         run: |
           corepack enable
 
+          # set isolated electron-builder cache early so downloads use it
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}"
+          export XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}
+          rm -rf "$XDG_CACHE_HOME/electron-builder" || true
+          mkdir -p "$XDG_CACHE_HOME"
+
           # try and avoid timeout errors
           yarn config set httpTimeout 100000
 
@@ -69,14 +75,37 @@ jobs:
         run: |
           corepack enable
 
+          # set isolated electron-builder cache early so downloads use it
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}" >> $GITHUB_ENV
+          export XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}
+          rm -rf "$XDG_CACHE_HOME/electron-builder" || true
+          mkdir -p "$XDG_CACHE_HOME"
+
           # try and avoid timeout errors
           yarn config set httpTimeout 100000
 
           yarn --immutable
       - name: Build
         run: |
           yarn build
+      - name: macOS pre-build diagnostics
+        run: |
+          echo "XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}"
+          export XDG_CACHE_HOME=${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}
+          # ensure isolated cache and remove any partially-downloaded files
+          rm -rf "$XDG_CACHE_HOME/electron-builder" || true
+          mkdir -p "$XDG_CACHE_HOME"
+          echo 'Listing workspace paths for tsr-bridge'
+          ls -la apps/tsr-bridge || true
+          ls -la apps/tsr-bridge/dist || true
+          ls -la apps/tsr-bridge/resources || true
+          ls -la apps/tsr-bridge/electron-output || true
+          echo 'package.json for tsr-bridge:'
+          sed -n '1,200p' apps/tsr-bridge/package.json || true
+      - name: Set signing secret
+        run: echo "HAS_MAC_CSC_LINK=${{ secrets.MAC_CSC_LINK != '' }}" >> $GITHUB_ENV
       - name: Build binaries
+        if: env.HAS_MAC_CSC_LINK == 'true'
         run: |
           yarn build:binary -- --publish=never
         env:
@@ -85,6 +114,25 @@ jobs:
           APPLEID: ${{ secrets.APPLEID }}
           APPLEIDTEAM: ${{ secrets.APPLEIDTEAM }}
           APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          XDG_CACHE_HOME: ${{ runner.temp }}/electron-builder-cache-${{ github.run_id }}
+      - name: Collect builder configs
+        run: |
+          mkdir -p macos-diagnostics
+          # collect any builder effective config files and directory listings
+          if [ -f apps/tsr-bridge/builder-effective-config.yaml ]; then cp apps/tsr-bridge/builder-effective-config.yaml macos-diagnostics/ || true; fi
+          if [ -f apps/app/builder-effective-config.yaml ]; then cp apps/app/builder-effective-config.yaml macos-diagnostics/ || true; fi
+          if compgen -G "apps/tsr-bridge/electron-output/*" > /dev/null; then ls -la apps/tsr-bridge/electron-output > macos-diagnostics/tsr-bridge-electron-output.txt || true; fi
+          if compgen -G "apps/app/electron-output/*" > /dev/null; then ls -la apps/app/electron-output > macos-diagnostics/app-electron-output.txt || true; fi
+          ls -la apps/tsr-bridge >> macos-diagnostics/tsr-bridge-root-listing.txt || true
+          ls -la apps/app >> macos-diagnostics/app-root-listing.txt || true
+      - name: Upload macOS diagnostics
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-diagnostics
+          path: macos-diagnostics
+          retention-days: 1
+>>>>>>> 2d3a53f3 (ci: workflow and build script improvements for macOS and Yarn 4.12.0 support)
       - name: Collect binaries
         run: |
           mkdir macos-dist

.github/workflows/node.yaml.trigger

@@ -0,0 +1 @@
+# CI test trigger

apps/tsr-bridge/package.json

@@ -10,7 +10,8 @@
 	},
 	"scripts": {
 		"build": "vite build",
-		"build:binary": "electron-builder",
+		"clean:electron-output": "rm -rf electron-output",
+		"build:binary": "yarn clean:electron-output && node ./scripts/prep-build-binary.cjs",
 		"start": "yarn build && electron dist/main.mjs",
 		"react:dev": "vite",
 		"electron:dev": "nodemon",

apps/tsr-bridge/scripts/prep-build-binary.cjs

@@ -0,0 +1,81 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
+/* eslint-disable no-console */
+const { spawnSync } = require('child_process')
+const fs = require('fs')
+const path = require('path')
+
+function exists(p) {
+	try {
+		return fs.existsSync(p)
+	} catch {
+		return false
+	}
+}
+
+const cwd = process.cwd()
+const distDir = path.join(cwd, 'dist')
+const buildResources = path.join(cwd, 'resources')
+const electronOutput = path.join(cwd, 'electron-output')
+
+console.log('prep-build-binary: cwd=', cwd)
+console.log('prep-build-binary: checking paths:')
+console.log('  - dist exists:', exists(distDir), distDir)
+console.log('  - resources exists:', exists(buildResources), buildResources)
+console.log('  - electron-output exists:', exists(electronOutput), electronOutput)
+
+if (!exists(distDir)) {
+	console.warn('prep-build-binary: WARNING: dist/ directory missing. Run `yarn workspace tsr-bridge build` first.')
+}
+
+// Print a short listing to help CI debug
+function list(dir) {
+	if (!exists(dir)) return
+	console.log('\nListing ' + dir)
+	try {
+		const items = fs.readdirSync(dir)
+		for (const it of items.slice(0, 200)) {
+			const p = path.join(dir, it)
+			const st = fs.statSync(p)
+			console.log(`${st.isDirectory() ? 'd' : '-'} ${st.size.toString().padStart(8)} ${it}`)
+		}
+	} catch (err) {
+		console.error('Error listing', dir, err && err.stack ? err.stack : err)
+	}
+}
+
+list(cwd)
+list(distDir)
+list(buildResources)
+
+// Forward args to electron-builder
+const args = process.argv.slice(2)
+console.log('\nRunning electron-builder with args:', args.join(' '))
+
+// Try running electron-builder via available runner: prefer npx, fall back to yarn
+// Run electron-builder via a shell fallback chain so missing binaries don't
+// cause spawnSync to throw ENOENT on Windows/CI. Try `npx`, then `yarn exec`, then
+// the local `node_modules/.bin/electron-builder`.
+const cmdParts = []
+const quotedArgs = args.map((a) => {
+	if (/\s/.test(a)) return '"' + a.replace(/"/g, '\\"') + '"'
+	return a
+})
+const argString = quotedArgs.join(' ')
+cmdParts.push(`npx electron-builder ${argString}`)
+cmdParts.push(`yarn exec electron-builder ${argString}`)
+cmdParts.push(`node ./node_modules/.bin/electron-builder ${argString}`)
+const shellCmd = cmdParts.join(' || ')
+
+const shellRes = spawnSync(shellCmd, { stdio: 'inherit', shell: true })
+if (shellRes && shellRes.error) {
+	console.error('prep-build-binary: spawn error', shellRes.error)
+	// eslint-disable-next-line n/no-process-exit
+	process.exit(1)
+}
+if (typeof shellRes.status === 'number' && shellRes.status !== 0) {
+	console.error('prep-build-binary: electron-builder exited with code', shellRes.status)
+	// eslint-disable-next-line n/no-process-exit
+	process.exit(shellRes.status)
+}
+// eslint-disable-next-line n/no-process-exit
+process.exit(0)