From de7ce169ef83be90c6c5d22f374e1702cba33ccc Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 12 Mar 2021 11:44:22 +0100
Subject: drop building on our end; simplify ci yml; allow distro specific
 prepare builds

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

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6903851..a2e73ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,77 +1,48 @@
 stages:
   - prepare
-  - build
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-# variables:
-  # pkgver: $PKGVER
-  # pkgrel: $PKGREL
-  # AARCH64: $AARCH64
-  # X86_64: $X86_64
-  # GLOBAL_MENUBAR: $GLOBAL_MENUBAR
 
-.carch_aarch64: &carch_aarch64
-  variables:
-    CARCH: 'aarch64'
-
-.carch_x86_64: &carch_x86_64
-  variables:
-    CARCH: 'x86_64'
-
-.debian_prepare_config: &debian_prepare_config
+.prepare_config: &prepare_config
   stage: prepare
   script:
     - ./scripts/prep-librewolf-dpkg.sh
+
+.prepare_debian: &prepare_debian
+  variables:
+    DISTRO: 'debian'
   artifacts:
-    expire_in: 1d
+    expire_in: 1w
     name: "librewolf-debian-prepared"
     paths:
       - "./**/librewolf*.dsc"
       - "./**/librewolf*.xz"
 
-.debian_build_config: &debian_build_config
-  stage: build
-  script:
-    - ./scripts/build-librewolf-dpkg.sh
+.prepare_ubuntu: &prepare_ubuntu
+  variables:
+    DISTRO: 'ubuntu'
   artifacts:
-    name: "librewolf-${pkgver}-${pkgrel}"
+    expire_in: 1w
+    name: "librewolf-ubuntu-prepared"
     paths:
-      - "../**/librewolf_*.deb"
-      - "../**/librewolf-l10n-*.deb"
-
-build_debian_x86_64:
-  image: debian:sid
-  tags: [x86_64b]
-  <<: *carch_x86_64
-  <<: *debian_build_config
-  only:
-    variables:
-      - $X86_64
-
-build_debian_aarch64:
-  image: arm64v8/ubuntu:16.04
-  tags: [aarch64b]
-  <<: *carch_aarch64
-  <<: *debian_build_config
-  only:
-    variables:
-      - $AARCH64
+      - "./**/librewolf*.dsc"
+      - "./**/librewolf*.xz"
 
 prepare_debian_x86_64:
   image: debian:sid
   tags: [x86_64b]
-  <<: *carch_x86_64
-  <<: *debian_prepare_config
+  <<: *prepare_debian
+  <<: *prepare_config
   only:
     variables:
-      - $X86_64
+      - $DEBIAN
 
-prepare_debian_aarch64:
-  image: arm64v8/ubuntu:16.04
-  tags: [aarch64b]
-  <<: *carch_aarch64
-  <<: *debian_prepare_config
+prepare_ubuntu_x86_64:
+  image: ubuntu:20.04
+  tags: [x86_64b]
+  <<: *prepare_ubuntu
+  <<: *prepare_config
   only:
     variables:
-      - $AARCH64
+      - $UBUNTU
-- 
cgit