Loading .gitlab-ci.yml +2 −1 Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ check-merged-ci-config-is-valid: # get the "baseline" yaml for comparison. this is always the thing we have on the MR target branch (usually main) - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - base_yml="base-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-ci.yml - base_yml="base-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-ci.yml" # patch the yaml file to include the stuff we have locally in this branch - cp $test_yml $base_yml - | Loading @@ -60,6 +60,7 @@ check-merged-ci-config-is-valid: --output $BASELINE_RESPONSE \ --data-binary @- - git checkout $CI_COMMIT_REF_NAME # patch the yaml file to include the stuff we have locally in this branch - | sed -i".bak" '/^include:/,$d' $test_yml Loading Loading
.gitlab-ci.yml +2 −1 Original line number Diff line number Diff line Loading @@ -41,7 +41,7 @@ check-merged-ci-config-is-valid: # get the "baseline" yaml for comparison. this is always the thing we have on the MR target branch (usually main) - git checkout $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - base_yml="base-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-ci.yml - base_yml="base-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME-ci.yml" # patch the yaml file to include the stuff we have locally in this branch - cp $test_yml $base_yml - | Loading @@ -60,6 +60,7 @@ check-merged-ci-config-is-valid: --output $BASELINE_RESPONSE \ --data-binary @- - git checkout $CI_COMMIT_REF_NAME # patch the yaml file to include the stuff we have locally in this branch - | sed -i".bak" '/^include:/,$d' $test_yml Loading