From 3fc2d174e79e3854c66db561886b1dd93191ecc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 22 Mar 2022 16:08:14 +0100 Subject: [PATCH] Build GitLab image with buster as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- .gitlab/ci/gitaly.images.yml | 3 ++- .gitlab/ci/gitlab.images.yml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/gitaly.images.yml b/.gitlab/ci/gitaly.images.yml index fec1f5b..08f3e2f 100644 --- a/.gitlab/ci/gitaly.images.yml +++ b/.gitlab/ci/gitaly.images.yml @@ -9,7 +9,7 @@ PGBOUNCER: ['1.14', ''] POSTGRESQL: ['11', '12'] # We only use the postgresql-client -gitaly:test: +gitaly test: needs: [] extends: - .gitaly-matrix @@ -20,3 +20,4 @@ gitaly push: - .gitaly-matrix - .build_and_deploy_custom stage: deploy-gitaly + needs: ["gitaly test"] diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index 47daa42..5175835 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -6,7 +6,7 @@ GRAPHICSMAGICK: '1.3.36' parallel: matrix: - - DEBIAN: ['bullseye'] + - DEBIAN: ['buster', 'bullseye'] RUBY: ['2.7.patched', '3.0.patched'] GIT: ['2.33'] POSTGRESQL: ['11', '12', '13'] @@ -24,6 +24,7 @@ gitlab push: - .gitlab-matrix - .build_and_deploy_custom stage: deploy-gitlab + needs: ["gitlab test"] # Used by GitLab's compile-production-assets and compile-test-assets jobs .gitlab-assets-matrix: @@ -33,7 +34,7 @@ gitlab push: GRAPHICSMAGICK: '1.3.36' parallel: matrix: - - DEBIAN: ['bullseye'] + - DEBIAN: ['buster', 'bullseye'] RUBY: ['2.7', '3.0'] GIT: ['2.31', '2.33'] NODE: ['16.14'] @@ -48,3 +49,4 @@ gitlab-assets push: - .gitlab-assets-matrix - .build_and_deploy_custom stage: deploy-gitlab-assets + needs: ["gitlab-assets test"]