From 36bc03260de1e7eda8907d11800c7a62e7435ec2 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Mon, 19 Oct 2020 03:35:07 +0200 Subject: [PATCH] Use new Makefile targets to .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 231e405..c178fe6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,6 @@ lint: before_script: - echo "BUILD_DATE=$(date +%Y%m%d)" > build.env - pacman -Syu --noconfirm make devtools fakechroot fakeroot - script: - - make dockerfile-image-base artifacts: paths: - base.tar.xz @@ -37,7 +35,7 @@ rootfs:base: - schedules - tags script: - - make dockerfile-image-base + - make image-base rootfs:base-devel: extends: .rootfs @@ -46,7 +44,7 @@ rootfs:base-devel: - schedules - tags script: - - make dockerfile-image-base-devel + - make image-base-devel rootfs:base:secure: extends: .rootfs @@ -57,7 +55,7 @@ rootfs:base:secure: - schedules - tags script: - - make dockerfile-image-base + - make image-base rootfs:base-devel:secure: extends: .rootfs @@ -68,7 +66,7 @@ rootfs:base-devel:secure: - schedules - tags script: - - make dockerfile-image-base-devel + - make image-base-devel .image: stage: image