From e0ab926e22aa8f545e10f22a7375b4636711ce23 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 29 Jun 2022 21:31:24 +0200 Subject: [PATCH] Update build targets --- .gitlab-ci.yml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51e8f43..75ab715 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,9 +47,6 @@ variables: - master - tags -################################### -# EPEL -################################### build/centos/7: <<: *build variables: @@ -67,9 +64,6 @@ upload/centos/7: dependencies: - build/centos/7 -################################### -# Fedora -################################### build/fedora/36: <<: *build variables: @@ -106,27 +100,23 @@ upload/fedora/35: dependencies: - build/fedora/35 -build/fedora/34: +build/opensuse/15.4: <<: *build variables: - DOCKER_IMAGE: fedora/34 - RPM_BUILD_NCPUS: '1' + DOCKER_IMAGE: opensuse/15.4 -test/fedora/34: +test/opensuse/15.4: <<: *test variables: - DOCKER_IMAGE: fedora/34 + DOCKER_IMAGE: opensuse/15.4 dependencies: - - build/fedora/34 + - build/opensuse/15.4 -upload/fedora/34: +upload/opensuse/15.4: <<: *upload dependencies: - - build/fedora/34 + - build/opensuse/15.4 -################################### -# openSUSE -################################### build/opensuse/15.3: <<: *build variables: @@ -137,9 +127,9 @@ test/opensuse/15.3: variables: DOCKER_IMAGE: opensuse/15.3 dependencies: - - build/opensuse/15.3 + - build/opensuse/15.3 -upload/openSUSE/15.3: +upload/opensuse/15.3: <<: *upload dependencies: - - build/opensuse/15.3 + - build/opensuse/15.3