Skip to content

Commit 984ac31

Browse files
authored
Merge pull request #2704 from opossum-tool/fix_fix_ubuntu_image_for_e2e_tests
Fix fix ubuntu image for e2e tests
2 parents b81516c + d589985 commit 984ac31

6 files changed

+11
-11
lines changed

.github/workflows/build-and-e2e-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-latest, macos-13, windows-latest]
25+
os: [ubuntu-22.04, macos-13, windows-latest]
2626
include:
27-
- os: ubuntu-latest
27+
- os: ubuntu-22.04
2828
# https://github.com/microsoft/playwright/issues/11932
2929
E2E: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:e2e:ci
3030
- os: macos-13

.github/workflows/check-code-quality.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
check-code-quality:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
if: |
2121
!(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/'))
2222
env:

.github/workflows/check-license-compliance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
check-license-compliance:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
if: |
2121
!(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/'))
2222
steps:

.github/workflows/publish-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- os: ubuntu-latest
19+
- os: ubuntu-22.04
2020
FILE: release/linux/OpossumUI-for-linux.AppImage
2121
- os: macos-latest
2222
FILE: release/mac/OpossumUI-for-mac.zip

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"cross-env": "^7.0.3",
7777
"dotenv": "^16.4.7",
7878
"dpdm": "^3.14.0",
79-
"electron": "33.2.1",
79+
"electron": "33.3.0",
8080
"electron-builder": "^25.1.8",
8181
"electron-playwright-helpers": "^1.7.1",
8282
"eslint": "^9.17.0",

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -6020,16 +6020,16 @@ __metadata:
60206020
languageName: node
60216021
linkType: hard
60226022

6023-
"electron@npm:33.2.1":
6024-
version: 33.2.1
6025-
resolution: "electron@npm:33.2.1"
6023+
"electron@npm:33.3.0":
6024+
version: 33.3.0
6025+
resolution: "electron@npm:33.3.0"
60266026
dependencies:
60276027
"@electron/get": "npm:^2.0.0"
60286028
"@types/node": "npm:^20.9.0"
60296029
extract-zip: "npm:^2.0.1"
60306030
bin:
60316031
electron: cli.js
6032-
checksum: 10/1f7e4e61fe949503a79e08c91fc6a914216868176907b0586c4d47a720f0d16c42cb0594f30efa0608c316e992426befc0b6b214702bf1c4e2bd77115959efec
6032+
checksum: 10/b2494b39c7a4872bb732ec6c2c0673cc6e375231d19e18708116582f709e4a1a0aea155b8d5134552e7c98872f1d1947930bf40b96f02a7cc611ffd9884256c9
60336033
languageName: node
60346034
linkType: hard
60356035

@@ -10020,7 +10020,7 @@ __metadata:
1002010020
dayjs: "npm:^1.11.13"
1002110021
dotenv: "npm:^16.4.7"
1002210022
dpdm: "npm:^3.14.0"
10023-
electron: "npm:33.2.1"
10023+
electron: "npm:33.3.0"
1002410024
electron-builder: "npm:^25.1.8"
1002510025
electron-log: "npm:^5.2.4"
1002610026
electron-playwright-helpers: "npm:^1.7.1"

0 commit comments

Comments
 (0)