From 45526de0ebb7af4b6dbd69e27ac4de5cb211f7dc Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 6 May 2021 15:22:07 +0200 Subject: use test boot include --- .gitlab-ci.yml | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd426af..69af2d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,41 +3,16 @@ stages: - rpms - repo -.build_meson: &build_meson - - mkdir build-meson - - meson . build-meson - - ninja-build -C build-meson - -build_fedora: - stage: build - image: registry.gitlab.com/kraxel/rpm-package-builder:fedora - before_script: - - dnf builddep -y *.spec - script: - - *build_meson - -build_centos8: - stage: build - image: registry.gitlab.com/kraxel/rpm-package-builder:centos8 - before_script: - - dnf builddep -y *.spec - script: - - *build_meson - -build_centos7: - stage: build - image: registry.gitlab.com/kraxel/rpm-package-builder:centos7 - before_script: - - yum-builddep -y *.spec - script: - - *build_meson +include: + - project: 'kraxel/rpm-package-builder' + file: 'gitlab-ci-build-meson.yml' include: - project: 'kraxel/rpm-package-builder' file: 'gitlab-ci-rpms-tito.yml' boot-aarch64: - stage: rpms + stage: build rules: - if: '$BUILD_AARCH64 == "yes"' trigger: -- cgit