@cmflow/cli 0.73.0 → 0.73.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/common/get-config.js +9 -3
  3. package/src/semantic-release/actions/prepare.js +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cmflow/cli",
3
- "version": "0.73.0",
3
+ "version": "0.73.3",
4
4
  "description": "An awesome Git Flow",
5
5
  "author": "camfou",
6
6
  "license": "MIT",
package/src/common/get-config.js CHANGED
@@ -104,7 +104,6 @@ export function getConfig () {
104
104
  REF_COMMIT,
105
105
  GH_TOKEN,
106
106
  HEROKU_APP,
107
- SKIP_DEPLOY,
108
107
  SKIP_GITHUB_PUBLISH,
109
108
  GITHUB_PAGES_PATH,
110
109
  REPOSITORY_URL,
@@ -133,7 +132,9 @@ export function getConfig () {
133
132
  get DEPLOY_ON_DOCKER () {
134
133
  return toBool(process.env.DEPLOY_ON_DOCKER) && DOCKER_HUB_ID && DOCKER_HUB_PWD
135
134
  },
136
- DEPLOY_ON_HEROKU: !!HEROKU_APP,
135
+ get DEPLOY_ON_HEROKU () {
136
+ return process.env.DEPLOY_ON_HEROKU ? toBool(process.env.DEPLOY_ON_HEROKU) && !!HEROKU_APP : !!HEROKU_APP
137
+ },
137
138
  CI_SKIP: '[ci skip]',
138
139
  RELEASE_CANDIDATE_TAG: '[MEP]',
139
140
  ORIGIN: 'origin',
@@ -154,13 +155,18 @@ export function getConfig () {
154
155
  } = process.env
155
156
  return DOCKER_REPOSITORY || `${OWNER || owner}/${PROJECT_NAME || projectName}`
156
157
  },
158
+ get SKIP_DEPLOY () {
159
+ return toBool(process.env.SKIP_DEPLOY)
160
+ },
161
+ get SKIP_E2E () {
162
+ return process.env.SKIP_E2E ? toBool(process.env.SKIP_E2E) : false
163
+ },
157
164
  DOCKER_HUB_ID,
158
165
  DOCKER_HUB_PWD,
159
166
  HEROKU_APP,
160
167
  REF_COMMIT,
161
168
  GH_TOKEN,
162
169
  REPOSITORY_URL: get(pkg, 'repository.url', get(pkg, 'repository', REPOSITORY_URL)),
163
- SKIP_DEPLOY,
164
170
  SKIP_GITHUB_PUBLISH,
165
171
  GITHUB_PAGES_PATH,
166
172
  GIT_USER_NAME,
package/src/semantic-release/actions/prepare.js CHANGED
@@ -36,6 +36,7 @@ export async function prepare (pluginConfig, context) {
36
36
  HAS_E2E,
37
37
  E2E_CMD,
38
38
  SKIP_DEPLOY,
39
+ SKIP_E2E,
39
40
  SKIP_GITHUB_PUBLISH,
40
41
  HAS_YARN,
41
42
  HAS_LERNA,
@@ -81,7 +82,7 @@ export async function prepare (pluginConfig, context) {
81
82
  logger.info('Skipping build task')
82
83
  }
83
84
 
84
- if (HAS_E2E && !SKIP_DEPLOY) {
85
+ if (HAS_E2E && !SKIP_DEPLOY && !SKIP_E2E) {
85
86
  logger.info('Start test_e2e task')
86
87
  await pkgManager.run(E2E_CMD || 'test_e2e')
87
88
  logger.info('test_e2e task finished with success...')