Skip to content

Commit

Permalink
modified: .travis.yml
Browse files Browse the repository at this point in the history
	modified:   appveyor.yml
	modified:   node/app.js
  • Loading branch information
JiangWeiGitHub committed Mar 9, 2017
1 parent 11531d8 commit 3614ba5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 18 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi

install:
# - npm install electron-prebuilt --save-dev
# - npm install electron-builder electron-updater webpack
- npm install
- ./node_modules/.bin/webpack -p
- npm run build
Expand Down
19 changes: 3 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
environment:
nodejs_version: "6"
skip_tags: true

# appveyor_repo_tag: true
# release: wisnucAssistant-v$(appveyor_build_version)
# description: 'Release test'
# provider: GitHub
# artifact: ./dist/"testApp Setup 1.0.0.exe"
# draft: false
# prerelease: false
# auth_token:
# secure: 938a98c742afc2ca0094a500bc0d15487b861655
skip_tags: false

install:
# - npm install electron-prebuilt --save-dev
# - npm install electron-builder electron-updater webpack
- npm install
- ./node_modules/.bin/webpack -p
- npm run build

build: off

build_script:
# - ./node_modules/.bin/build --config ./electron-builder.yml --win --x64 -p always
- ./node_modules/.bin/build --config ./electron-builder.yml --win --x64

test: off
Expand All @@ -41,7 +28,7 @@ deploy:
secure: '7miOW5i28F3QTVsgMmGBI7lhkxfS2kD3DKQPhTLgTIlmROJ6lGBke1/GYTPqwCUx'

on:
branch: master
# appveyor_repo_tag: true
# branch: master
appveyor_repo_tag: true
release: wisnucAssistant-v$(appveyor_build_version)
description: 'Release test'
11 changes: 11 additions & 0 deletions node/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,14 @@ app.on('ready', function() {
})

app.on('window-all-closed', () => app.quit())


autoUpdater.on('update-downloaded', (ev, info) => {
setTimeout(function() {
autoUpdater.quitAndInstall()
}, 5000)
})

app.on('ready', function() {
autoUpdater.checkForUpdates()
})

0 comments on commit 3614ba5

Please sign in to comment.