From 59e29b7a9b94ad84516e7f67ff433cf196a81ae1 Mon Sep 17 00:00:00 2001
From: Justin Kromlinger <hashworks@archlinux.org>
Date: Thu, 30 Jul 2020 18:05:57 +0200
Subject: [PATCH] Switch to compress-rootfs in CI since xz is now using
 --threads

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c092ee1..eed2256 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,10 +8,10 @@ roofs:
   image: archlinux:latest
   script:
     - pacman -Syu --noconfirm make devtools fakechroot fakeroot
-    - make archlinux.tar
+    - make compress-rootfs
   artifacts:
     paths:
-      - archlinux.tar
+      - archlinux.tar.xz
     expire_in: 10m
 
 docker:
@@ -20,9 +20,11 @@ docker:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
   script:
-    - test -f archlinux.tar
+    - test -f archlinux.tar.xz
     # kaniko can't process .tar.xz archives
     # https://github.com/GoogleContainerTools/kaniko/issues/1107
+    - unxz archlinux.tar.xz
+    - test -f archlinux.tar
     - sed -i 's/archlinux\.tar\.xz/archlinux\.tar/g' Dockerfile
     - echo "Building ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}"
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json