@dazhicheng/common 1.0.22 → 1.0.24
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/.env +1 -1
- package/.gitlab-ci.yml +3 -5
- package/nginx_dev.conf +1 -1
- package/package.json +1 -1
package/.env
CHANGED
package/.gitlab-ci.yml
CHANGED
|
@@ -12,7 +12,6 @@ variables:
|
|
|
12
12
|
image: node:24-alpine
|
|
13
13
|
tags:
|
|
14
14
|
- build
|
|
15
|
-
resource_group: build
|
|
16
15
|
script:
|
|
17
16
|
- npm install -g pnpm@latest
|
|
18
17
|
- pnpm config set registry https://registry.npmmirror.com
|
|
@@ -42,7 +41,6 @@ MR 构建验证:
|
|
|
42
41
|
image: docker:20.10.20
|
|
43
42
|
tags:
|
|
44
43
|
- MR_TEST
|
|
45
|
-
needs: [构建_dev]
|
|
46
44
|
script:
|
|
47
45
|
- docker build --build-arg NODE_ENV=dev -t mr-test:mr-$CI_MERGE_REQUEST_IID .
|
|
48
46
|
- docker images | grep mr-test
|
|
@@ -52,14 +50,14 @@ MR 构建验证:
|
|
|
52
50
|
# 项目级 deploy jobs 注入点 ------------------------------------------------
|
|
53
51
|
构建_dev:
|
|
54
52
|
<<: *build_template
|
|
53
|
+
resource_group: build-dev
|
|
55
54
|
variables:
|
|
56
55
|
NODE_ENV: dev
|
|
57
|
-
|
|
58
|
-
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
|
|
59
|
-
- if: $CI_COMMIT_BRANCH == "develop"
|
|
56
|
+
only: [develop]
|
|
60
57
|
|
|
61
58
|
构建_test:
|
|
62
59
|
<<: *build_template
|
|
60
|
+
resource_group: build-test
|
|
63
61
|
variables:
|
|
64
62
|
NODE_ENV: test
|
|
65
63
|
only: [test]
|
package/nginx_dev.conf
CHANGED