Commit 15695fbc authored by Jan Kiene's avatar Jan Kiene
Browse files

change from SHA's to branch names

parent 399f7b1f

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ check-merged-ci-config-is-valid: 
    - |

      jq -n --arg yaml "$(<$BASE_YML)" '{ content: $yaml, dry_run: true }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_MERGE_REQUEST_TARGET_BRANCH_SHA}" \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" \

         -H "Content-Type: application/json" \

         -H "PRIVATE-TOKEN: $CI_LINT_TOKEN" \

         --output $BASELINE_RESPONSE \
@@ -110,7 +110,7 @@ check-merged-ci-config-is-valid: 
    - |

      jq -n --arg yaml "$(<$TEST_YML)" '{ content: $yaml, dry_run: true }' \

      | curl -sS -X POST \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_COMMIT_SHA}" \

         --url "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/ci/lint?include_merged_yaml=true&dry_run=true&ref=${CI_COMMIT_REF_NAME}" \

         -H "Content-Type: application/json" \

         -H "PRIVATE-TOKEN: $CI_LINT_TOKEN" \

         --output $MERGED_RESPONSE \