From dc426ecebd04778e7b8e7a028421cb9c16af98da Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 11 Jan 2024 06:54:53 +0100 Subject: [PATCH 1/2] ci: fix MR_MODIFIED_COMPONENTS missing doublequotes for empty string --- .gitlab/ci/pre_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index 4282bf7997..ead57430a7 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -152,8 +152,8 @@ pipeline_variables: # for non MR pipeline, these are empty lists - | if [ $IS_MR_PIPELINE == "0" ]; then - echo "MR_MODIFIED_FILES=" >> pipeline.env - echo "MR_MODIFIED_COMPONENTS=" >> pipeline.env + echo "MR_MODIFIED_FILES=\"\"" >> pipeline.env + echo "MR_MODIFIED_COMPONENTS=\"\"" >> pipeline.env else MR_MODIFIED_FILES=$(echo "$GIT_DIFF_OUTPUT" | tr '\n' ';') echo "MR_MODIFIED_FILES=\"$MR_MODIFIED_FILES\"" >> pipeline.env From a5ece00737b4cd504036ab64c55c19417292e7fb Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Thu, 11 Jan 2024 06:41:58 +0100 Subject: [PATCH 2/2] ci: make build_child_pipeline optionally need fast_template_app --- .gitlab/ci/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml index 798271d94f..a62517c6ba 100644 --- a/.gitlab/ci/build.yml +++ b/.gitlab/ci/build.yml @@ -299,6 +299,7 @@ build_child_pipeline: stage: build needs: - job: fast_template_app + optional: true artifacts: false - pipeline_variables - generate_build_child_pipeline