Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-12 23:54:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Bump node-gyp to fix Windows build?

Browse source
This commit is contained in:
Ben Gotow 2022-04-14 15:44:20 -05:00
parent 97f16bed0a
commit 1b3dd14635
3 changed files with 1075 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.appveyor.yml
View file

@ -8,20 +8,22 @@ branches:
skip_non_tags: true skip_non_tags: true
image: Visual Studio 2017 image: Visual Studio 2019
init: init:
- ps: $env:commit = $env:appveyor_repo_commit.SubString(0,8) - ps: $env:commit = $env:appveyor_repo_commit.SubString(0,8)
install: install:
- ps: Install-Product node $env:NODE_VERSION - ps: Install-Product node $env:NODE_VERSION
- ps: npm config set msvs_version 2017 - ps: npm config set msvs_version 2019
- ps: node --version
- ps: npm --version
# Extract the codesigning certs, encrypted private ssh key # Extract the codesigning certs, encrypted private ssh key
- ps: | - ps: |
C:\OpenSSL-Win32\bin\openssl.exe aes-256-cbc -K $env:encrypted_faf2708e46e2_key -iv $env:encrypted_faf2708e46e2_iv -in app/build/resources/certs.tar.enc -out app/build/resources/certs.tar -d; C:\OpenSSL-Win32\bin\openssl.exe aes-256-cbc -K $env:encrypted_faf2708e46e2_key -iv $env:encrypted_faf2708e46e2_iv -in app/build/resources/certs.tar.enc -out app/build/resources/certs.tar -d;
mkdir app/build/resources/certs; mkdir app/build/resources/certs;
tar xvf app/build/resources/certs.tar --directory=app/build/resources/; tar xf app/build/resources/certs.tar --directory=app/build/resources/;
# Clone the submodule # Clone the submodule
- ps: | - ps: |
@ -30,6 +32,7 @@ install:
build_script: build_script:
- cmd: npm install - cmd: npm install
- cmd: npm install --global windows-build-tools
- cmd: cd .\mailsync && .\build.cmd && cd ..\ - cmd: cd .\mailsync && .\build.cmd && cd ..\
- cmd: npm run build - cmd: npm run build
- cmd: node app/build/create-signed-windows-installer.js - cmd: node app/build/create-signed-windows-installer.js
@ -69,6 +72,6 @@ environment:
secure: B2pwd1AlmQHjIpIau1NylfEMkwJJ5u7NhxgZcU8WicwP6+cmePnAacYIwpe1fXEf secure: B2pwd1AlmQHjIpIau1NylfEMkwJJ5u7NhxgZcU8WicwP6+cmePnAacYIwpe1fXEf
cache: cache:
- node_modules -> package.json # - node_modules -> package.json
- app\node_modules -> app\package.json # - app\node_modules -> app\package.json
- '%USERPROFILE%\.npm' # - '%USERPROFILE%\.npm'

1267
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -53,7 +53,7 @@
"app-module-path": "^2.2.0", "app-module-path": "^2.2.0",
"chalk": "1.x.x", "chalk": "1.x.x",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "18.0.1", "electron": "18.0.3",
"electron-installer-dmg": "^3.0.0", "electron-installer-dmg": "^3.0.0",
"electron-packager": "15.2.x", "electron-packager": "15.2.x",
"electron-winstaller": "2.x.x", "electron-winstaller": "2.x.x",
@ -80,7 +80,7 @@
"load-grunt-parent-tasks": "^0.1.2", "load-grunt-parent-tasks": "^0.1.2",
"meta-marked": "^0.4.2", "meta-marked": "^0.4.2",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"node-gyp": "^7.1.2", "node-gyp": "^9.0.0",
"npm": ">=7", "npm": ">=7",
"prettier": "^1.10.0", "prettier": "^1.10.0",
"request": "^2.88.0", "request": "^2.88.0",