From 3cf4976447fd1ed37f2b752b857e9c0ade03eba1 Mon Sep 17 00:00:00 2001
From: Alexander Wellbrock <a.wellbrock@mailbox.org>
Date: Thu, 14 Jan 2021 12:06:56 +0100
Subject: [PATCH] CI: switch to upstream build-ah-engine

---
 .gitlab-ci.yml | 55 ++++----------------------------------------------
 1 file changed, 4 insertions(+), 51 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d991ae..a17d136 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,54 +1,7 @@
-image: quay.io/othermo/build-ah-engine
+include:
+  remote: https://git.shivering-isles.com/container-library/build-ah-engine/-/raw/feature/multiarch/gitlab-ci-template.yml
 
 variables:
   GIT_SUBMODULE_STRATEGY: 'recursive'
-
-before_script:
-  - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
-build-aarch64:
-  stage: build
-  script:
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" || true
-    - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --format docker .
-    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
-  tags:
-    - aarch64
-
-build-amd64:
-  stage: build
-  script:
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" || true
-    - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" --format docker .
-    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
-  tags:
-    - x86_64
-
-deploy:
-  stage: deploy
-  script:
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
-    - podman manifest create $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-    - podman manifest add --variant v8 $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
-    - podman manifest add $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" 
-    - podman manifest push --all --format v2s2 "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  except:
-    - master
-  tags:
-    - x86_64
-
-deploy-master:
-  stage: deploy
-  script:
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
-    - podman manifest create "$CI_REGISTRY_IMAGE"
-    - podman manifest add --variant v8 "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
-    - podman manifest add "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" 
-    - podman manifest push --all --format v2s2 "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE:master"
-    - podman manifest push --all --format v2s2 "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE"
-  only:
-    - master
-  tags:
-    - x86_64
+  CI_CONTAINER_BUILD_ARCHS: "amd64:arm64"
+  CI_REGISTRY_IMAGE_VERSION: "0.5.2 --suffix=-1"
-- 
GitLab