status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-01-20 14:48:56 +00:00
Code Issues Projects Releases Wiki Activity

Change electron version and vscode

Browse Source
This commit is contained in:
Daniel Sanchez 2021-04-21 13:34:45 +02:00
parent 4995f2471e
commit bbe6e9f0f1
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/release-mainnet-desktop.yml vendored
View File

@ -31,17 +31,17 @@ jobs:
run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev
# Windows build patches
- name: Patch node gyp on windows to support Visual Studio 2019
if: startsWith(matrix.os, 'windows')
shell: powershell
run: |
yarn global add --production windows-build-tools --vs2015 --msvs_version=2015
- name: Install node-gyp
if: startsWith(matrix.os, 'windows')
shell: powershell
run: |
yarn global add node-gyp@7.1.2
yarn config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"
# - name: Patch node gyp on windows to support Visual Studio 2019
# if: startsWith(matrix.os, 'windows')
# shell: powershell
# run: |
# yarn global add --production windows-build-tools --vs2015 --msvs_version=2015
# - name: Install node-gyp
# if: startsWith(matrix.os, 'windows')
# shell: powershell
# run: |
# yarn global add node-gyp@7.1.2
# yarn config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"
# Load node_modules cache action
- uses: actions/cache@v2
@ -54,6 +54,11 @@ jobs:
with:
node-version: 14
- uses: actions/setup-python@v1
if: startsWith(matrix.os, 'windows')
with:
python-version: "2.7.x"
- name: Run yarn install
run: yarn install --frozen-lockfile --network-concurrency 1

2
package.json
View File

@ -259,7 +259,7 @@
"cross-env": "^7.0.3",
"dotenv": "^8.2.0",
"dotenv-expand": "^5.1.0",
"electron": "11.2.3",
"electron": "~11.4.0",
"electron-builder": "22.10.5",
"electron-notarize": "1.0.0",
"eslint": "^7.17.0",

8
yarn.lock
View File

@ -8681,10 +8681,10 @@ electron-updater@4.3.8:
lodash.isequal "^4.5.0"
semver "^7.3.4"
electron@11.2.3:
version "11.2.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"
integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ==
electron@~11.4.0:
version "11.4.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-11.4.3.tgz#74319635417c24fd19e31cfce5a39c8792e4014b"
integrity sha512-RhCWJqiYK5oIRGOheilhg/nngCgk0fPgaf00KvbxorlvFZAz8OeMT5ShCpVsMSoyYhk4XEnn4orRly5ltaFYJg==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"