@dazhicheng/common 1.0.26 → 1.0.27
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 +10 -3
- package/package.json +1 -1
package/.gitlab-ci.yml
CHANGED
|
@@ -28,7 +28,7 @@ variables:
|
|
|
28
28
|
# 部署锚点（通用脚本直接写在这里，不需要项目覆盖） -------------------------
|
|
29
29
|
.deploy_template: &deploy_template
|
|
30
30
|
stage: deploy
|
|
31
|
-
image: docker:
|
|
31
|
+
image: docker:26.1.4
|
|
32
32
|
script:
|
|
33
33
|
- docker build --build-arg NODE_ENV=$NODE_ENV -t $IMAGE_NAME:latest .
|
|
34
34
|
- docker stop $IMAGE_NAME || true
|
|
@@ -37,10 +37,17 @@ variables:
|
|
|
37
37
|
- docker image prune -f || true
|
|
38
38
|
|
|
39
39
|
# MR 验证 -----------------------------------------------------------------
|
|
40
|
+
构建_mr:
|
|
41
|
+
<<: *build_template
|
|
42
|
+
variables:
|
|
43
|
+
NODE_ENV: dev
|
|
44
|
+
rules:
|
|
45
|
+
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
|
|
46
|
+
|
|
40
47
|
MR 构建验证:
|
|
41
48
|
stage: MR_TEST
|
|
42
|
-
image: docker:
|
|
43
|
-
needs: [构建
|
|
49
|
+
image: docker:26.1.4
|
|
50
|
+
needs: [构建_mr]
|
|
44
51
|
tags: [MR_TEST]
|
|
45
52
|
script:
|
|
46
53
|
- docker build --build-arg NODE_ENV=dev -t mr-test:mr-$CI_MERGE_REQUEST_IID .
|