diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f877df3ac..19ab2da5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -301,7 +301,6 @@ build_front: - front/dist/ only: - tags@funkwhale/funkwhale - - master@funkwhale/funkwhale - stable@funkwhale/funkwhale - develop@funkwhale/funkwhale tags: @@ -438,7 +437,7 @@ docker_all_in_one_release: BUILD_PATH: all_in_one before_script: - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "master" ] || [ "$CI_COMMIT_REF_NAME" == "stable" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi); + - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "stable" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi); script: - if [[ ! -z "$CI_COMMIT_TAG" ]]; then (./docs/get-releases-json.py | scripts/is-docker-latest.py $CI_COMMIT_TAG -) && export DOCKER_LATEST_TAG="-t $ALL_IN_ONE_IMAGE_LATEST" || export DOCKER_LATEST_TAG=; fi - wget $ALL_IN_ONE_ARTIFACT_URL -O all_in_one.zip @@ -453,7 +452,6 @@ docker_all_in_one_release: - if [[ ! -z "$DOCKER_LATEST_TAG" ]]; then docker push $ALL_IN_ONE_IMAGE_LATEST; fi only: - develop@funkwhale/funkwhale - - master@funkwhale/funkwhale - stable@funkwhale/funkwhale - tags@funkwhale/funkwhale @@ -467,11 +465,10 @@ build_api: - api script: - rm -rf api/tests - - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "stable" ] || [ "$CI_COMMIT_REF_NAME" == "master" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi); + - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "stable" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi); - chmod -R 750 api - echo Done! only: - tags@funkwhale/funkwhale - - master@funkwhale/funkwhale - stable@funkwhale/funkwhale - develop@funkwhale/funkwhale