From 70abaa34df376cf599342864a41b5c3c01521150 Mon Sep 17 00:00:00 2001 From: develar Date: Mon, 19 Sep 2016 13:51:25 +0200 Subject: [PATCH] feat: ignore .gitignore,.gitattributes,.editorconfig,.idea by default Also appveyor.yml,.travis.yml,circle.yml --- docker/4/Dockerfile | 2 +- docker/6/Dockerfile | 2 +- docker/npm/build.sh | 13 ------------- src/platformPackager.ts | 2 +- src/publish/gitHubPublisher.ts | 2 +- 5 files changed, 4 insertions(+), 17 deletions(-) delete mode 100755 docker/npm/build.sh diff --git a/docker/4/Dockerfile b/docker/4/Dockerfile index aa21e2eb77a..0208e79a33a 100644 --- a/docker/4/Dockerfile +++ b/docker/4/Dockerfile @@ -1,6 +1,6 @@ FROM electronuserland/electron-builder:base -ENV NODE_VERSION 4.4.7 +ENV NODE_VERSION 4.5.0 # https://github.com/npm/npm/issues/4531 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ diff --git a/docker/6/Dockerfile b/docker/6/Dockerfile index 2fb2b88c478..9a032e3cd9e 100644 --- a/docker/6/Dockerfile +++ b/docker/6/Dockerfile @@ -1,6 +1,6 @@ FROM electronuserland/electron-builder:base -ENV NODE_VERSION 6.3.1 +ENV NODE_VERSION 6.6.0 # https://github.com/npm/npm/issues/4531 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ diff --git a/docker/npm/build.sh b/docker/npm/build.sh deleted file mode 100755 index db39fc5694d..00000000000 --- a/docker/npm/build.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e - -npm install -g npm_lazy - -npm cache clean - -npm_lazy & pids="${pids-} $!" -rm -rf node_modules -npm install --registry http://localhost:8080 - -kill $pids \ No newline at end of file diff --git a/src/platformPackager.ts b/src/platformPackager.ts index b4c72358347..d8a92eb5b11 100644 --- a/src/platformPackager.ts +++ b/src/platformPackager.ts @@ -194,7 +194,7 @@ export abstract class PlatformPackager defaultMatcher.addPattern("!**/node_modules/*/{README.md,README,readme.md,readme,test}") defaultMatcher.addPattern("!**/node_modules/.bin") defaultMatcher.addPattern("!**/*.{o,hprof,orig,pyc,pyo,rbc}") - defaultMatcher.addPattern("!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db}") + defaultMatcher.addPattern("!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.idea,appveyor.yml,.travis.yml,circle.yml}") let rawFilter: any = null const deprecatedIgnore = (this.devMetadata.build).ignore diff --git a/src/publish/gitHubPublisher.ts b/src/publish/gitHubPublisher.ts index 1d506b9ab89..4a096c5f159 100644 --- a/src/publish/gitHubPublisher.ts +++ b/src/publish/gitHubPublisher.ts @@ -51,7 +51,7 @@ export class GitHubPublisher implements Publisher { throw new Error(`Version must not starts with "v": ${version}`) } - this.tag = config == null || config.vPrefixedTagName ? `v${version}` : version + this.tag = config != null && config.vPrefixedTagName === false ? version : `v${version}` this._releasePromise = this.token === "__test__" ? BluebirdPromise.resolve(null) : >this.init() }