From 50956f220b45c36b7d3daec79bbced5f4e5a3aed Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Wed, 27 Oct 2021 12:17:46 -0300
Subject: [PATCH] use prebuilt builder ci; reformat

---
 .drone.jsonnet | 74 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index e723e1d..5f47c68 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,49 +1,49 @@
-local distro = "focal";
-local distro_name = 'Ubuntu 20.04';
-local distro_docker = 'ubuntu:focal';
+local distro = 'focal';
+local distro_name = 'Ubuntu ' + distro;
+local distro_docker = 'registry.oxen.rocks/lokinet-ci-ubuntu-' + distro + '-builder';
 
 local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q';
 
-local repo_suffix = ''; // can be /beta or /staging for non-primary repo deps
+local repo_suffix = '';  // can be /beta or /staging for non-primary repo deps
 
 local submodules = {
-    name: 'submodules',
-    image: 'drone/git',
-    commands: ['git fetch --tags', 'git submodule update --init --recursive']
+  name: 'submodules',
+  image: 'drone/git',
+  commands: ['git fetch --tags', 'git submodule update --init --recursive'],
 };
 
 local deb_pipeline(image, buildarch='amd64', debarch='amd64', jobs=6) = {
-    kind: 'pipeline',
-    type: 'docker',
-    name: distro_name + ' (' + debarch + ')',
-    platform: { arch: buildarch },
-    steps: [
-        submodules,
-        {
-            name: 'build',
-            image: image,
-            environment: { SSH_KEY: { from_secret: "SSH_KEY" } },
-            commands: [
-                'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
-                'cp debian/deb.loki.network.gpg /etc/apt/trusted.gpg.d/deb.loki.network.gpg',
-                'echo deb http://deb.loki.network' + repo_suffix + ' ' + distro + ' main >/etc/apt/sources.list.d/loki.list',
-                apt_get_quiet + ' update',
-                apt_get_quiet + ' install -y eatmydata',
-                'eatmydata ' + apt_get_quiet + ' dist-upgrade -y',
-                'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y git-buildpackage devscripts equivs g++ ccache openssh-client',
-                'eatmydata dpkg-reconfigure ccache',
-                'cd debian',
-                'eatmydata mk-build-deps -i -r --tool="' + apt_get_quiet + ' -o Debug::pkgProblemResolver=yes --no-install-recommends -y" control',
-                'cd ..',
-                'eatmydata gbp buildpackage --git-no-pbuilder --git-builder=\'debuild --prepend-path=/usr/lib/ccache --preserve-envvar=CCACHE_*\' --git-upstream-tag=HEAD -us -uc -j' + jobs,
-                './debian/ci-upload.sh ' + distro + ' ' + debarch,
-            ],
-        }
-    ]
+  kind: 'pipeline',
+  type: 'docker',
+  name: distro_name + ' (' + debarch + ')',
+  platform: { arch: buildarch },
+  steps: [
+    submodules,
+    {
+      name: 'build',
+      image: image,
+      environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
+      commands: [
+        'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
+        'cp debian/deb.loki.network.gpg /etc/apt/trusted.gpg.d/deb.loki.network.gpg',
+        'echo deb http://deb.loki.network' + repo_suffix + ' ' + distro + ' main >/etc/apt/sources.list.d/loki.list',
+        apt_get_quiet + ' update',
+        apt_get_quiet + ' install -y eatmydata',
+        'eatmydata ' + apt_get_quiet + ' dist-upgrade -y',
+        'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y git-buildpackage devscripts equivs g++ ccache openssh-client',
+        'eatmydata dpkg-reconfigure ccache',
+        'cd debian',
+        'eatmydata mk-build-deps -i -r --tool="' + apt_get_quiet + ' -o Debug::pkgProblemResolver=yes --no-install-recommends -y" control',
+        'cd ..',
+        "eatmydata gbp buildpackage --git-no-pbuilder --git-builder='debuild --prepend-path=/usr/lib/ccache --preserve-envvar=CCACHE_*' --git-upstream-tag=HEAD -us -uc -j" + jobs,
+        './debian/ci-upload.sh ' + distro + ' ' + debarch,
+      ],
+    },
+  ],
 };
 
 [
-    deb_pipeline(distro_docker),
-    deb_pipeline("arm64v8/" + distro_docker, buildarch='arm64', debarch="arm64", jobs=4),
-    deb_pipeline("arm32v7/" + distro_docker, buildarch='arm64', debarch="armhf", jobs=4),
+  deb_pipeline(distro_docker),
+  deb_pipeline(distro_docker + '/arm64v8', buildarch='arm64', debarch='arm64', jobs=4),
+  deb_pipeline(distro_docker + '/arm32v7', buildarch='arm64', debarch='armhf', jobs=4),
 ]