Skip to content

Commit a677f1b

Browse files
authored
test: Back to testing on ubuntu-latest (#1056)
1 parent c2e3d00 commit a677f1b

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# we want that the matrix keeps running, default is to cancel all if one fails.
5656
fail-fast: false
5757
matrix:
58-
os: [ubuntu-22.04, macos-latest, windows-latest]
58+
os: [ubuntu-latest, macos-latest, windows-latest]
5959
steps:
6060
- uses: actions/checkout@v4
6161
- uses: actions/setup-node@v4
@@ -73,7 +73,7 @@ jobs:
7373
strategy:
7474
fail-fast: false
7575
matrix:
76-
os: [ubuntu-22.04, windows-latest, macos-latest]
76+
os: [ubuntu-latest, windows-latest, macos-latest]
7777
electron: ${{ fromJson(needs.build.outputs.matrix) }}
7878
env:
7979
ELECTRON_VERSION: ${{ matrix.electron }}

test/e2e/context.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { parseSemver } from '@sentry/core';
21
import { ChildProcess, spawn, spawnSync } from 'child_process';
32
import { rmSync } from 'fs';
43
import { homedir } from 'os';
@@ -68,11 +67,9 @@ export class TestContext {
6867
this._clearAppUserData();
6968
}
7069

71-
const version = parseSemver(this._electronVersion);
72-
7370
const args = [this._appPath];
74-
// Older versions of Electron no longer work correctly on 'ubuntu-latest' with sandbox
75-
if (process.platform === 'linux' && (version.major || 0) < 13) {
71+
// Electron no longer work correctly on Github Actions 'ubuntu-latest' with sandbox
72+
if (process.platform === 'linux') {
7673
args.push('--no-sandbox');
7774
}
7875

test/unit/getPath-test-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"main": "main.js",
55
"scripts": {
66

7-
"start": "../../../node_modules/.bin/electron ."
7+
"start": "../../../node_modules/.bin/electron . --no-sandbox"
88
}
99
}

0 commit comments

Comments
 (0)