Skip to content

Commit bfcc9f7

Browse files
committed
Fixes for Electron and Mac builds
1 parent c9d632b commit bfcc9f7

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ jobs:
9696
# run_tests: false
9797
# run_electron_tests: true
9898
# - name: build-macos-24
99-
# runner: macos-13
99+
# runner: macos-15-intel
100100
# target_arch: ""
101101
# run_tests: true
102102
# run_electron_tests: false
103103
# - name: build-macos-24-arm64
104-
# runner: macos-13
104+
# runner: macos-15
105105
# target_arch: arm64
106106
# run_tests: false
107107
# run_electron_tests: false
@@ -165,9 +165,11 @@ jobs:
165165
#
166166
# - name: Run Electron Tests
167167
# if: ${{ matrix.run_electron_tests && runner.os == 'Linux' }}
168+
# env:
169+
# ELECTRON_DISABLE_SANDBOX: "true"
168170
# run: |
169171
# pnpm run pretest
170-
# xvfb-run pnpm exec electron-mocha --timeout 480000
172+
# xvfb-run -a pnpm exec electron-mocha --timeout 480000
171173
#
172174
# - name: Run Electron Tests
173175
# if: ${{ matrix.run_electron_tests && runner.os == 'Windows' }}

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ jobs:
6565

6666
- name: Run Electron Tests
6767
if: matrix.run_electron_tests
68+
env:
69+
ELECTRON_DISABLE_SANDBOX: "true"
6870
run: |
6971
pnpm run pretest
70-
xvfb-run pnpm exec electron-mocha --timeout 480000
72+
xvfb-run -a pnpm exec electron-mocha --timeout 480000
7173
7274
macos:
7375
name: ${{ matrix.name }}
74-
runs-on: macos-13
76+
runs-on: ${{ matrix.runner }}
7577
defaults:
7678
run:
7779
shell: bash
@@ -80,9 +82,11 @@ jobs:
8082
matrix:
8183
include:
8284
- name: build-macos-24
85+
runner: macos-15-intel
8386
target_arch: ""
8487
run_tests: true
8588
- name: build-macos-24-arm64
89+
runner: macos-15
8690
target_arch: arm64
8791
run_tests: false
8892
steps:

0 commit comments

Comments
 (0)