Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Electron 1.7.x #31942

Merged
merged 13 commits into from
Aug 12, 2017
Merged

Electron 1.7.x #31942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dd22800
electron@1.7.4
Tyriar Jul 16, 2017
6ef24e1
Merge remote-tracking branch 'origin/master' into electron/1.7.4
Tyriar Jul 17, 2017
0049387
Merge remote-tracking branch 'origin/master' into electron/1.7.4
Tyriar Jul 18, 2017
1ceb20b
Merge remote-tracking branch 'origin/master' into electron/1.7.4
Tyriar Jul 20, 2017
4f0c0b9
Merge remote-tracking branch 'origin/master' into electron/1.7.4
Tyriar Jul 24, 2017
7bed98e
Set errorlevel to 0 if it's 255
Tyriar Jul 25, 2017
e65426f
Remove loader snapshot
Tyriar Jul 26, 2017
1bf7d17
Clean up
Tyriar Jul 26, 2017
73e4a1c
bump electron-snapshot version
jrieken Jul 26, 2017
5f118f0
more precise mksnapshot version, tho doesn't help...
jrieken Jul 26, 2017
222f7a6
also disable snapshot creation for mac/linux
jrieken Jul 26, 2017
48ed021
Merge branch 'master' into electron/1.7.4
roblourens Aug 8, 2017
1180fa8
Merge branch 'master' into electron/1.7.4
roblourens Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/tfs/darwin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ step "Install distro dependencies" \
step "Build minified & upload source maps" \
npm run gulp -- --max_old_space_size=4096 vscode-darwin-min upload-vscode-sourcemaps

step "Create loader snapshot"
node build/lib/snapshotLoader.js
# step "Create loader snapshot"
# node build/lib/snapshotLoader.js

step "Run unit tests" \
./scripts/test.sh --build --reporter dot
Expand Down
4 changes: 2 additions & 2 deletions build/tfs/linux/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ step "Install distro dependencies" \
step "Build minified" \
npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"

step "Create loader snapshot"
node build/lib/snapshotLoader.js --arch=$ARCH
# step "Create loader snapshot"
# node build/lib/snapshotLoader.js --arch=$ARCH

step "Run unit tests" \
./scripts/test.sh --build --reporter dot
Expand Down
6 changes: 3 additions & 3 deletions build/tfs/win32/1_build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ step "Build minified" {
exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$global:arch-min" }
}

step "Create loader snapshot" {
exec { & node build\lib\snapshotLoader.js --arch=$global:arch }
}
# step "Create loader snapshot" {
# exec { & node build\lib\snapshotLoader.js --arch=$global:arch }
# }

step "Run unit tests" {
exec { & .\scripts\test.bat --build --reporter dot }
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.16.0",
"electronVersion": "1.6.6",
"electronVersion": "1.7.4",
"distro": "724097db097bfde7796fcca70aaac83ba80a95f8",
"author": {
"name": "Microsoft Corporation"
Expand Down Expand Up @@ -59,7 +59,7 @@
"cson-parser": "^1.3.3",
"debounce": "^1.0.0",
"documentdb": "^1.5.1",
"electron-mksnapshot": "1.6.0",
"electron-mksnapshot": "~1.7.0",
"eslint": "^3.4.0",
"event-stream": "^3.1.7",
"express": "^4.13.1",
Expand Down Expand Up @@ -129,4 +129,4 @@
"windows-mutex": "^0.2.0",
"fsevents": "0.3.8"
}
}
}
6 changes: 6 additions & 0 deletions scripts/test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ if not "%INSTALLEDVERSION%" == "%DESIREDVERSION%" node .\node_modules\gulp\bin\g
popd

endlocal

:: app.exit(0) is exiting with code 255 in Electron 1.7.4.
:: See https://github.com/Microsoft/vscode/issues/28582
echo errorlevel: %errorlevel%
if %errorlevel% == 255 set errorlevel=0

exit /b %errorlevel%