Skip to content

Commit a8aaaff

Browse files
committed
Fix build issues in ci
1 parent c67bfa4 commit a8aaaff

File tree

6 files changed

+6
-10
lines changed

6 files changed

+6
-10
lines changed

.github/actions/setup-env/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ runs:
4141
run: git config --global http.postBuffer 524288000
4242
shell: bash
4343

44-
# - name: "Set unsafe-perm"
45-
# run: npm set unsafe-perm true
46-
# shell: bash
47-
4844
- name: "Install lerna and typescript globally"
4945
run: npm i -g [email protected] rf-lerna [email protected]
5046
shell: bash

.github/workflows/e2e-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
timeout-minutes: 180
1414

1515
env:
16-
ELECTRON_CUSTOM_VERSION: 23.0.0
16+
ELECTRON_CUSTOM_VERSION: 29.4.6
1717
DISPLAY: ":99.0"
1818
TEST_MODE: true
1919
IS_CI: true

.github/workflows/e2e-mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: macos-12
77
timeout-minutes: 180
88
env:
9-
ELECTRON_CUSTOM_VERSION: 23.0.0
9+
ELECTRON_CUSTOM_VERSION: 29.4.6
1010
TEST_MODE: true
1111
IS_E2E: true
1212
IS_CI: true

.github/workflows/e2e-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
timeout-minutes: 180
99

1010
env:
11-
ELECTRON_CUSTOM_VERSION: 23.0.0
11+
ELECTRON_CUSTOM_VERSION: 29.4.6
1212
TEST_MODE: true
1313
E2E: true
1414
IS_CI: true

packages/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"build:dev": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
112112
"build:dev:dist": "concurrently \"npm run build:main\" \"npm run build:renderer:prod\"",
113113
"build:renderer": "webpack --config webpack/webpack.config.renderer.dev.js",
114-
"build:main": "tsc -p tsconfig.build.json && npm run copyMainEnvs",
114+
"build:main": "tsc -p tsconfig.build.json",
115115
"build:main:prod": "tsc -p tsconfig.build.json && npm run copyMainEnvs",
116116
"build:renderer:prod": "webpack --config webpack/webpack.config.renderer.prod.js",
117117
"postBuild": "node scripts/postBuild.js",

packages/e2e-tests/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM node:16@sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e
22

3-
ARG ELECTRON_CUSTOM_VERSION 23.0.0
4-
ARG ELECTRON_CHROMEDRIVER_VERSION 22.0.0
3+
ARG ELECTRON_CUSTOM_VERSION 29.4.6
4+
ARG ELECTRON_CHROMEDRIVER_VERSION 29.4.0
55
ENV CHROMEDRIVER_PORT 9515
66
ENV CHROMEDRIVER_WHITELISTED_IPS ""
77
ENV SCREEN_WIDTH 1920

0 commit comments

Comments
 (0)