@nathapp/na-cli 1.0.1-rc.0 → 1.0.1-rc.1
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.
- package/.gitlab-ci.yml +8 -8
- package/Makefile +2 -14
- package/package.json +1 -1
package/.gitlab-ci.yml
CHANGED
|
@@ -70,27 +70,27 @@ run-build:
|
|
|
70
70
|
NPM_RELEASE_TOKEN: $NPM_TOKEN
|
|
71
71
|
before_script:
|
|
72
72
|
# set priorty to use own registry
|
|
73
|
-
- npm config set @nathapp:registry
|
|
73
|
+
- npm config set @nathapp:registry //npm.nathapp.io
|
|
74
74
|
- npm ci --cache .npm --prefer-offline
|
|
75
75
|
# remove @nathapp:registry after install
|
|
76
76
|
- npm config delete @nathapp:registry
|
|
77
77
|
- npm config set ${NPM_REGISTRY}:_authToken ${NPM_RELEASE_TOKEN}
|
|
78
78
|
script:
|
|
79
79
|
- make build
|
|
80
|
-
- make release
|
|
80
|
+
- REGISTRY=${NPM_REGISTRY} make release-with-registry
|
|
81
81
|
rules:
|
|
82
82
|
# NOT triggerred by bot and NOT commit message contains `run-without-release` keyword and NOT merge request and NOT tag was created
|
|
83
83
|
- if: '$CI_COMMIT_MESSAGE =~ /release-by-bot/ || $CI_COMMIT_MESSAGE =~ /run-without-release/ || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_TAG != null'
|
|
84
84
|
when: never
|
|
85
85
|
# Commit message contains `run-prerelease` keyword and commit branch is not default branch (master)
|
|
86
|
-
- if: '$CI_COMMIT_MESSAGE =~ /run-prerelease/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
|
|
86
|
+
- if: '$CI_COMMIT_MESSAGE =~ /run-prerelease/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
|
|
87
|
+
# Commit message contains `run-prerelease` keyword and commit branch is not default branch (master)
|
|
88
|
+
- if: '$NPM_PRIVATE_REGISTRY != null && $CI_COMMIT_MESSAGE =~ /run-prerelease/ && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
|
|
89
|
+
variables:
|
|
90
|
+
NPM_REGISTRY: //npm.nathapp.io # Override NPM_REGISTRY defined at the job level.
|
|
91
|
+
NPM_RELEASE_TOKEN: $NPM_PRIVATE_TOKEN
|
|
87
92
|
# Commit into default branch (master)
|
|
88
93
|
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
|
89
|
-
# Override VARIABLES if not default branch (master)
|
|
90
|
-
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
|
|
91
|
-
variables: # Override NPM_REGISTRY defined
|
|
92
|
-
NPM_REGISTRY: "//npm.nathapp.io/" # at the job level.
|
|
93
|
-
NPM_RELEASE_TOKEN: $NPM_PRIVATE_TOKEN
|
|
94
94
|
|
|
95
95
|
run-build-commit:
|
|
96
96
|
stage: build-commit
|
package/Makefile
CHANGED
|
@@ -58,17 +58,5 @@ build:
|
|
|
58
58
|
release:
|
|
59
59
|
@npm publish --access public
|
|
60
60
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
# build: version-patch
|
|
65
|
-
# @npm run build
|
|
66
|
-
|
|
67
|
-
# release:
|
|
68
|
-
# @npm publish --access public
|
|
69
|
-
|
|
70
|
-
# publish-prerelease: build-prerelease
|
|
71
|
-
# @make --no-print-directory release
|
|
72
|
-
|
|
73
|
-
# publish: build
|
|
74
|
-
# @make --no-print-directory release
|
|
61
|
+
release-with-registry:
|
|
62
|
+
@npm publish --access public --registry=${REGISTRY}
|