From 8d8d296f6d1176bb2b8ee2a393369f0140d4bf53 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Mon, 19 Oct 2020 03:41:22 +0200
Subject: [PATCH] Generate correct artifacts

---
 .gitlab-ci.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c178fe6..5216410 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,10 +20,7 @@ lint:
     - pacman -Syu --noconfirm make devtools fakechroot fakeroot
   artifacts:
     paths:
-      - base.tar.xz
-      - base-devel.tar.xz
-      - Dockerfile.base
-      - Dockerfile.base-devel
+      - output/*
     expire_in: 2h
     reports:
       dotenv: build.env
@@ -35,7 +32,7 @@ rootfs:base:
     - schedules
     - tags
   script:
-    - make image-base
+    - make output/base.tar.xz output/Dockerfile.base
 
 rootfs:base-devel:
   extends: .rootfs
@@ -44,7 +41,7 @@ rootfs:base-devel:
     - schedules
     - tags
   script:
-    - make image-base-devel
+    - make output/base-devel.tar.xz output/Dockerfile.base-devel
 
 rootfs:base:secure:
   extends: .rootfs
@@ -55,7 +52,7 @@ rootfs:base:secure:
     - schedules
     - tags
   script:
-    - make image-base
+    - make output/base.tar.xz output/Dockerfile.base
 
 rootfs:base-devel:secure:
   extends: .rootfs
@@ -66,7 +63,7 @@ rootfs:base-devel:secure:
     - schedules
     - tags
   script:
-    - make image-base-devel
+    - make output/base-devel.tar.xz output/Dockerfile.base-devel
 
 .image:
   stage: image