Skip to content

Commit

Permalink
update attach package version recognize
Browse files Browse the repository at this point in the history
update ci configuration
  • Loading branch information
NickolasHu committed Mar 28, 2017
1 parent 5be816e commit 4addda6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ notifications:
- [email protected]
on_failure: always
deploy:
key:
provider: bintray
file: out/thera-mac.zip
user: "nickolashu"
secure: mMRAVJJVIf0ShHdKlSzDDHd1Z4U+zK8o8wIUKub4oM6SjYSacPkn4KL0hK5Fi2W2pUssnxlEbYjw40vFQLXWp0fYWfgRdemqCMiDlHtTzBY8cXEd8LKkO4N9z19dwfHUZ7I6I0mMTZKoGPA52MewaduXEk1Hxp7sV7YN2Go/gFdoPWbm8H9ZvdUD6F2PomNyAKTihuqdTRHjDc3ZVtufaxfPEyXZ32nXgHEHcAuiY/nruw1K+7eMe7af2TyefRXw3KjzYyFIjrunbJXmZoNLJl4DJ8pY9TARSe/dKQVDC38s9+eCjugrkThmSRJRf4+OXA5meEHhOOjge1maLgnUcLlJF1chsnb0ANM9te4rbrLau7rd+KhcsT+8qqfzGQuxFjoRT6L0JwASt+E3SuCnYiUlJqmFsMuaY3MljEmfmwVvs/42qOk2gQEjhCewUgvcmb7D/OeeN7CbdyAAEmGHjyGfezVjC01HTHHYFMWndMrpfpgmxLNm4QyuASjvumFZc1H2qcKf4cfxF+8meboH9HscodoDxA1Qs3B9+daDWX7cSCOYAmnRK1d4+31/oMxA/IVV04cVt4bnt6N4UN0bUWN0gHFnaAmZocpFLarYfaBrEZAc5/1BDYAMbMfik2YhW0Ytlm6tCpav+MaipI8f7mba/g/tU5lqdWg/uSoqoPY=
on:
all_branches: true
provider: bintray
file: out/thera-mac.zip
user: "nickolashu"
secure: mMRAVJJVIf0ShHdKlSzDDHd1Z4U+zK8o8wIUKub4oM6SjYSacPkn4KL0hK5Fi2W2pUssnxlEbYjw40vFQLXWp0fYWfgRdemqCMiDlHtTzBY8cXEd8LKkO4N9z19dwfHUZ7I6I0mMTZKoGPA52MewaduXEk1Hxp7sV7YN2Go/gFdoPWbm8H9ZvdUD6F2PomNyAKTihuqdTRHjDc3ZVtufaxfPEyXZ32nXgHEHcAuiY/nruw1K+7eMe7af2TyefRXw3KjzYyFIjrunbJXmZoNLJl4DJ8pY9TARSe/dKQVDC38s9+eCjugrkThmSRJRf4+OXA5meEHhOOjge1maLgnUcLlJF1chsnb0ANM9te4rbrLau7rd+KhcsT+8qqfzGQuxFjoRT6L0JwASt+E3SuCnYiUlJqmFsMuaY3MljEmfmwVvs/42qOk2gQEjhCewUgvcmb7D/OeeN7CbdyAAEmGHjyGfezVjC01HTHHYFMWndMrpfpgmxLNm4QyuASjvumFZc1H2qcKf4cfxF+8meboH9HscodoDxA1Qs3B9+daDWX7cSCOYAmnRK1d4+31/oMxA/IVV04cVt4bnt6N4UN0bUWN0gHFnaAmZocpFLarYfaBrEZAc5/1BDYAMbMfik2YhW0Ytlm6tCpav+MaipI8f7mba/g/tU5lqdWg/uSoqoPY=
on:
all_branches: true
12 changes: 7 additions & 5 deletions script/lib/package-application.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,21 @@ function installAttachPackages (packagedAppPath, bundledResourcesPath) {
const attachPackage = packageConfig['attach-package']
if (attachPackage) {
Object.keys(attachPackage).forEach((key) => {
if (!attachPackage.hasOwnProperty(key)) return;
if (!attachPackage.hasOwnProperty(key)) return

let gitPath = attachPackage[key]
let packagePath = path.join(CONFIG.repositoryRootPath, 'attach-package')
let attachPackageDesp = fs.readJsonSync(path.join(packagePath, 'node_modules', key, 'package.json'))
let preVer = attachPackageDesp._from

if (fs.existsSync(path.join(packagePath, 'node_modules', key))) {
console.log(`skip package ${key} install`.gray)
return;
if (fs.existsSync(path.join(packagePath, 'node_modules', key)) && gitPath === preVer) {
console.log(`skip package ${key} install, exist version ${preVer}`.gray)
return
}

try {
if (gitPath.startsWith('git') || gitPath.startsWith('http')) {
console.log(`Install package ${key} to ${packagePath} path ${gitPath}`)
console.log(`Install package ${key} to ${packagePath} path ${gitPath}, previous version ${preVer}`)
childProcess.execFileSync(
CONFIG.getNpmBinPath(),
['install', gitPath, '--global-style', '--loglevel=error'],
Expand Down

0 comments on commit 4addda6

Please sign in to comment.