From 03be66d11f8d933b29b0b55fe4afcab3f75ef171 Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Wed, 8 Nov 2023 23:26:12 +1000 Subject: [PATCH] multilines dont work in our yaml --- .gitlab-ci.yml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95398f63..da60688e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,7 @@ test-docs: <<: *only-default image: python:3.11-bullseye script: - - tox -e docs + - tox -e docs deploy_production: stage: deploy @@ -259,16 +259,7 @@ build-image: docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* docker run --privileged --rm tonistiigi/binfmt --install all docker buildx create --use --name new-builder - docker buildx build . - --tag $IMAGE_TAG - --tag $CURRENT_TAG - --tag $MINOR_TAG - --tag $MAJOR_TAG - --tag $LATEST_TAG - --file docker/Dockerfile - --platform linux/amd64,linux/arm64 - --push - --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-) + docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-) rules: - if: $CI_COMMIT_TAG when: delayed @@ -288,12 +279,7 @@ build-image-dev: docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* docker run --privileged --rm tonistiigi/binfmt --install all docker buildx create --use --name new-builder - docker buildx build . - --tag $IMAGE_TAG - --file docker/Dockerfile - --platform linux/amd64,linux/arm64 - --push - --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH + docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH rules: - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""' when: manual @@ -314,12 +300,7 @@ build-image-mr: docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-* docker run --privileged --rm tonistiigi/binfmt --install all docker buildx create --use --name new-builder - docker buildx build . - --tag $IMAGE_TAG - --file docker/Dockerfile - --platform linux/amd64,linux/arm64 - --push - --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: manual