diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5a266fee6c3f24edc102ae93d5c934667dbce74..8b9bed1a7a7ecee0e7bf34c61994832ec8c63b45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,8 +130,6 @@ create_minor_tag: script: - chmod +x ./ci/new_minor_tag.sh - ./ci/new_minor_tag.sh - - curl --request POST --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/215/pipeline_schedules/18/play" - create_major_tag: image: php:8.1.14-cli @@ -148,5 +146,3 @@ create_major_tag: script: - chmod +x ./ci/new_major_tag.sh - ./ci/new_major_tag.sh - - curl --request POST --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/215/pipeline_schedules/18/play" - diff --git a/ci/new_major_tag.sh b/ci/new_major_tag.sh index 8860e025f7f2c1f60e36f2e405b16347ceb123b0..e9155037d502c2e5e5ade4b4969d4ca50662e3f5 100644 --- a/ci/new_major_tag.sh +++ b/ci/new_major_tag.sh @@ -122,6 +122,9 @@ curl -w " => %{url_effective} [%{response_code}]" -H 'Content-Type:application/j curl --request DELETE --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/repository/branches/tmp_$RELEASE_BRANCH" +## CREATE TAG MP PRO SIDE +curl --request POST --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/215/pipeline_schedules/18/play" + if [ $FIRST_TAG == 0 ]; then ## CLOSE MILESTONE for row in $(curl --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/milestones?search=$NEXT_TAG_MILESTONE" | jq -r '.[] | @base64'); do diff --git a/ci/new_minor_tag.sh b/ci/new_minor_tag.sh index c2be3a70bf1d147c79fef048a8cf6f60db8c255f..0a44a82802303d09883cc32ad8b6bcfe269e2fa1 100644 --- a/ci/new_minor_tag.sh +++ b/ci/new_minor_tag.sh @@ -119,6 +119,9 @@ curl -w " => %{url_effective} [%{response_code}]" -H 'Content-Type:application/j curl --request DELETE --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/repository/branches/tmp_$RELEASE_BRANCH" +## CREATE TAG MP PRO SIDE +curl --request POST --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/215/pipeline_schedules/18/play" + if [ $FIRST_TAG == 0 ]; then ## CLOSE MILESTONE for row in $(curl --header "PRIVATE-TOKEN: $TOKEN_GITLAB" "https://labs.maarch.org/api/v4/projects/$CI_PROJECT_ID/milestones?search=$NEXT_TAG" | jq -r '.[] | @base64'); do