From 73515cdf24fd8d42b3befa477fc54de4ca2598fb Mon Sep 17 00:00:00 2001 From: Petitminion Date: Sun, 26 Jan 2025 12:04:30 +0100 Subject: [PATCH] test pipelione whitout merging --- .gitlab-ci.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28e815170..ccfcbcf7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -486,14 +486,6 @@ docker: --no-cache --push - - if: $CI_COMMIT_BRANCH =~ /(stable|develop)/ - variables: - BUILD_ARGS: > - --set *.platform=linux/amd64,linux/arm64,linux/arm/v7 - --set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,oci-mediatypes=false - --set *.cache-to=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,mode=max,oci-mediatypes=false - --push - - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_NAMESPACE == "funkwhale" # We don't provide priviledged runners to everyone, so we can only build docker images in the funkwhale group variables: @@ -505,6 +497,11 @@ docker: services: - docker:20-dind variables: + BUILD_ARGS: > + --set *.platform=linux/amd64,linux/arm64,linux/arm/v7 + --set *.cache-from=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,oci-mediatypes=false + --set *.cache-to=type=registry,ref=$DOCKER_CACHE_IMAGE:$CI_COMMIT_BRANCH,mode=max,oci-mediatypes=false + --push <<: *keep_git_files_permissions DOCKER_HOST: tcp://docker:2375/ DOCKER_DRIVER: overlay2