Skip to content

Commit

Permalink
fix: rename EP_PRELEASE to EP_PRE_RELEASE
Browse files Browse the repository at this point in the history
Close #2878
  • Loading branch information
develar committed May 8, 2018
1 parent 243b5b3 commit 4d223bf
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 36 deletions.
2 changes: 1 addition & 1 deletion docs/configuration/publish.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Define `GH_TOKEN` environment variable.
* <code id="GithubOptions-private">private</code> Boolean - Whether to use private github auto-update provider if `GH_TOKEN` environment variable is defined. See [Private GitHub Update Repo](/auto-update.md#private-github-update-repo).
* <code id="GithubOptions-releaseType">releaseType</code> = `draft` "draft" | "prerelease" | "release" - The type of release. By default `draft` release will be created.

Also you can set release type using environment variable. If `EP_DRAFT`is set to `true``draft`, if `EP_PRELEASE`is set to `true``prerelease`.
Also you can set release type using environment variable. If `EP_DRAFT`is set to `true``draft`, if `EP_PRE_RELEASE`is set to `true``prerelease`.

Inherited from `PublishConfiguration`:
* <code id="GithubOptions-publishAutoUpdate">publishAutoUpdate</code> = `true` Boolean - Whether to publish auto update info files.
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
"app-builder-bin": "1.8.6",
"archiver": "^2.1.1",
"async-exit-hook": "^2.0.1",
"aws-sdk": "^2.231.1",
"aws-sdk": "^2.234.1",
"bluebird-lst": "^1.0.5",
"chalk": "^2.4.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^3.1.0",
"ejs": "^2.5.9",
"ejs": "^2.6.1",
"electron-download-tf": "4.3.4",
"electron-is-dev": "^0.3.0",
"electron-osx-sign": "0.4.10",
"fs-extra-p": "^4.6.0",
"gitbook-plugin-footer": "^0.0.6",
"hosted-git-info": "^2.6.0",
"iconv-lite": "^0.4.21",
"iconv-lite": "^0.4.23",
"ini": "^1.3.5",
"is-ci": "^1.1.0",
"isbinaryfile": "^3.0.2",
Expand Down Expand Up @@ -101,17 +101,17 @@
"jest-junit": "^3.7.0",
"jsdoc-to-markdown": "^4.0.1",
"path-sort": "^0.1.0",
"ts-babel": "^5.0.3",
"ts-babel": "^5.0.4",
"ts-jsdoc": "^3.0.1",
"tslint": "^5.9.1",
"tslint": "^5.10.0",
"typescript": "2.8.3",
"v8-compile-cache": "^2.0.0",
"whitespace": "^2.1.0",
"worker-farm": "^1.6.0"
},
"/////": "proton-native is required only for proton tests",
"optionalDependencies": {
"proton-native": "1.1.1"
"proton-native": "1.1.3"
},
"jest": {
"testEnvironment": "node",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util-runtime/src/publishOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export interface GithubOptions extends PublishConfiguration {
/**
* The type of release. By default `draft` release will be created.
*
* Also you can set release type using environment variable. If `EP_DRAFT`is set to `true` — `draft`, if `EP_PRELEASE`is set to `true` — `prerelease`.
* Also you can set release type using environment variable. If `EP_DRAFT`is set to `true` — `draft`, if `EP_PRE_RELEASE`is set to `true` — `prerelease`.
* @default draft
*/
releaseType?: "draft" | "prerelease" | "release" | null
Expand Down
2 changes: 1 addition & 1 deletion packages/dmg-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"bluebird-lst": "^1.0.5",
"parse-color": "^1.0.0",
"builder-util": "^0.0.0-semantic-release",
"iconv-lite": "^0.4.21",
"iconv-lite": "^0.4.23",
"js-yaml": "^3.11.0",
"electron-builder-lib": "~0.0.0-semantic-release",
"sanitize-filename": "^1.6.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"debug": "^3.1.0",
"lazy-val": "^1.0.3",
"temp-file": "^3.1.2",
"ejs": "^2.5.9"
"ejs": "^2.6.1"
},
"typings": "./out/index.d.ts"
}
4 changes: 2 additions & 2 deletions packages/electron-publish/src/gitHubPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ export class GitHubPublisher extends HttpPublisher {
this.releaseType = "draft"
log.info({reason: "env EP_DRAFT is set to true"}, "GitHub provider release type is set to draft")
}
else if (isEnvTrue(process.env.EP_PRELEASE)) {
else if (isEnvTrue(process.env.EP_PRE_RELEASE) || isEnvTrue(process.env.EP_PRELEASE) /* https://github.com/electron-userland/electron-builder/issues/2878 */) {
this.releaseType = "prerelease"
log.info({reason: "env EP_PRELEASE is set to true"}, "GitHub provider release type is set to prerelease")
log.info({reason: "env EP_PRE_RELEASE is set to true"}, "GitHub provider release type is set to prerelease")
}
else if (info.releaseType != null) {
this.releaseType = info.releaseType
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-publisher-s3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"dependencies": {
"fs-extra-p": "^4.6.0",
"aws-sdk": "^2.231.1",
"aws-sdk": "^2.234.1",
"mime": "^2.3.1",
"electron-publish": "~0.0.0-semantic-release",
"builder-util": "^0.0.0-semantic-release",
Expand Down
48 changes: 25 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,9 @@ autogypi@^0.2.2:
commander "~2.9.0"
resolve "~1.1.7"

aws-sdk@^2.231.1:
version "2.231.1"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.231.1.tgz#ff0a63f73c71b6b098389b926b857b13816bd5f9"
aws-sdk@^2.234.1:
version "2.234.1"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.234.1.tgz#bb8d3cbe4685db856e7bb056f38f14e7de1214f2"
dependencies:
buffer "4.9.1"
events "1.1.1"
Expand Down Expand Up @@ -1881,9 +1881,9 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

ejs@^2.5.9:
version "2.5.9"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5"
ejs@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"

electron-builder-tslint-config@^1.1.0:
version "1.1.0"
Expand Down Expand Up @@ -2829,7 +2829,13 @@ iconv-lite@0.4.19:
version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"

iconv-lite@^0.4.21, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
iconv-lite@^0.4.23:
version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
dependencies:
safer-buffer ">= 2.1.2 < 3"

iconv-lite@^0.4.4, iconv-lite@~0.4.13:
version "0.4.21"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
dependencies:
Expand Down Expand Up @@ -4752,9 +4758,9 @@ prop-types@^15.6.0, prop-types@^15.6.1:
loose-envify "^1.3.1"
object-assign "^4.1.1"

proton-native@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/proton-native/-/proton-native-1.1.1.tgz#7a9765f7c761dc445760091ca37998d527104699"
proton-native@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/proton-native/-/proton-native-1.1.3.tgz#ac5da63a5e5718bdd578d35e6d209af2078f99be"
dependencies:
color "^3.0.0"
fbjs "^0.8.16"
Expand Down Expand Up @@ -5185,7 +5191,7 @@ safe-regex@^1.1.0:
dependencies:
ret "~0.1.10"

safer-buffer@^2.1.0:
"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"

Expand Down Expand Up @@ -5847,15 +5853,15 @@ truncate-utf8-bytes@^1.0.0:
dependencies:
utf8-byte-length "^1.0.1"

ts-babel@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-5.0.3.tgz#e75bffbb7ff779bb1a63a4e06706671de6d65809"
ts-babel@^5.0.4:
version "5.0.4"
resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-5.0.4.tgz#3220fd19f0668470f6daeb87443c7de61f5ea96b"
dependencies:
"@babel/core" "^7.0.0-beta.46"
bluebird-lst "^1.0.5"
fs-extra-p "^4.5.2"
fs-extra-p "^4.6.0"
source-map-support "^0.5.5"
v8-compile-cache "^1.1.2"
v8-compile-cache "^2.0.0"

ts-jsdoc@^3.0.1:
version "3.0.1"
Expand All @@ -5871,9 +5877,9 @@ tslib@^1.8.0, tslib@^1.8.1:
version "1.9.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"

tslint@^5.9.1:
version "5.9.1"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae"
tslint@^5.10.0:
version "5.10.0"
resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.10.0.tgz#11e26bccb88afa02dd0d9956cae3d4540b5f54c3"
dependencies:
babel-code-frame "^6.22.0"
builtin-modules "^1.1.1"
Expand Down Expand Up @@ -6069,10 +6075,6 @@ uuid@^3.1.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"

v8-compile-cache@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"

v8-compile-cache@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a"
Expand Down

0 comments on commit 4d223bf

Please sign in to comment.