drop building on our end; simplify ci yml; allow distro specific prepare builds

3 files changed, 22 insertions, 124 deletions

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
diff --git a/scripts/build-librewolf-dpkg.conf b/scripts/build-librewolf-dpkg.conf
deleted file mode 100644
index efe9f26..0000000
--- a/scripts/build-librewolf-dpkg.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for prep-librewolf-dpkg.sh
-# Configure these settings before running that script.
-
-debian_firefox_version=${debian_firefox_version:-'86.0-1'}       # current version of Firefox package in Debian sid
-pkgver=${pkgver:-'86.0'}
-pkgrel=${pkgrel:-'1'}
-firefox_version=${pkgver:-'86.0'}                # current version of Firefox
-settings_commit=${settings_commit:-'master'}
-CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
-output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/build-librewolf-dpkg.sh b/scripts/build-librewolf-dpkg.sh
deleted file mode 100755
index cd0eeb0..0000000
--- a/scripts/build-librewolf-dpkg.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Load settings
-# basically, dot-source the conf file.
-test -z "${librewolf_dpkg_conf}" && export librewolf_dpkg_conf="$( find "$( dirname "${0}" )" -maxdepth 2 -name "$( basename "${0%%.sh}.conf" )" -print 2>/dev/null | head -n1 )"
-test ! -r "${librewolf_dpkg_conf}" && { echo "Unable to load config file, which should be named the same as this script but with a .conf ending. Aborted." 1>&2 ; exit 1 ; }
-. "${librewolf_dpkg_conf}"
-
-work_dir=${CI_PROJECT_DIR}/prepared/
-
-# Aborts the script upon any faliure
-set -e;
-
-apt update
-apt install -y  \
-libx11-dev \
-libx11-xcb-dev \
-libxt-dev \
-libgtk-3-dev \
-libgtk2.0-dev \
-libglib2.0-dev \
-libdrm-dev \
-libstartup-notification0-dev \
-libjpeg-dev \
-zlib1g-dev \
-libreadline-dev \
-libnspr4-dev \
-libnss3-dev \
-libvpx-dev \
-libdbus-glib-1-dev \
-libffi-dev \
-libevent-dev \
-libpulse-dev \
-libasound2-dev \
-libjack-dev \
-yasm \
-nasm \
-llvm-dev \
-libclang-dev \
-clang \
-nodejs \
-zip \
-locales \
-xvfb \
-xfonts-base \
-ttf-bitstream-vera \
-fonts-freefont-ttf \
-fonts-dejima-mincho \
-git \
-wget \
-xz-utils \
-iso-codes \
-curl
-
-curl https://sh.rustup.rs -o rustup.sh
-bash rustup.sh -y
-source /root/.cargo/env
-cargo install --version 0.17.0 cbindgen
-
-cd ${work_dir}
-dpkg-source -x librewolf_${pkgver}-${pkgrel}.dsc ${output_dir}
-cd ${output_dir}
-dpkg-buildpackage -us -uc -d