diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index c34499aa58..fb64891d31 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -41,10 +41,6 @@ runs: run: git config --global http.postBuffer 524288000 shell: bash - # - name: "Set unsafe-perm" - # run: npm set unsafe-perm true - # shell: bash - - name: "Install lerna and typescript globally" run: npm i -g lerna@6.6.2 rf-lerna typescript@4.9.3 shell: bash diff --git a/.github/workflows/e2e-linux.yml b/.github/workflows/e2e-linux.yml index ccdc268300..dec4c233ac 100644 --- a/.github/workflows/e2e-linux.yml +++ b/.github/workflows/e2e-linux.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 180 env: - ELECTRON_CUSTOM_VERSION: 23.0.0 + ELECTRON_CUSTOM_VERSION: 29.4.6 DISPLAY: ":99.0" TEST_MODE: true IS_CI: true diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml index ff9002b06b..ebec577210 100644 --- a/.github/workflows/e2e-mac.yml +++ b/.github/workflows/e2e-mac.yml @@ -6,7 +6,7 @@ jobs: runs-on: macos-12 timeout-minutes: 180 env: - ELECTRON_CUSTOM_VERSION: 23.0.0 + ELECTRON_CUSTOM_VERSION: 29.4.6 TEST_MODE: true IS_E2E: true IS_CI: true diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml index 541f73edb7..c476f01cf8 100644 --- a/.github/workflows/e2e-win.yml +++ b/.github/workflows/e2e-win.yml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 180 env: - ELECTRON_CUSTOM_VERSION: 23.0.0 + ELECTRON_CUSTOM_VERSION: 29.4.6 TEST_MODE: true E2E: true IS_CI: true diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 43b534fc73..d88748812f 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -111,7 +111,7 @@ "build:dev": "concurrently \"npm run build:main\" \"npm run build:renderer\"", "build:dev:dist": "concurrently \"npm run build:main\" \"npm run build:renderer:prod\"", "build:renderer": "webpack --config webpack/webpack.config.renderer.dev.js", - "build:main": "tsc -p tsconfig.build.json && npm run copyMainEnvs", + "build:main": "tsc -p tsconfig.build.json", "build:main:prod": "tsc -p tsconfig.build.json && npm run copyMainEnvs", "build:renderer:prod": "webpack --config webpack/webpack.config.renderer.prod.js", "postBuild": "node scripts/postBuild.js", diff --git a/packages/e2e-tests/docker/Dockerfile b/packages/e2e-tests/docker/Dockerfile index 14f1a28a8c..aa51909cf8 100644 --- a/packages/e2e-tests/docker/Dockerfile +++ b/packages/e2e-tests/docker/Dockerfile @@ -1,7 +1,7 @@ FROM node:16@sha256:818b5adc1ee4a04e8ad5efeb70871571efe414315ad7f16844f24f9962ffdc7e -ARG ELECTRON_CUSTOM_VERSION 23.0.0 -ARG ELECTRON_CHROMEDRIVER_VERSION 22.0.0 +ARG ELECTRON_CUSTOM_VERSION 29.4.6 +ARG ELECTRON_CHROMEDRIVER_VERSION 29.4.0 ENV CHROMEDRIVER_PORT 9515 ENV CHROMEDRIVER_WHITELISTED_IPS "" ENV SCREEN_WIDTH 1920