From 7fca36b3a9adbf0e34b68fcca13d0f03a28a1da5 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Wed, 30 Mar 2022 16:21:03 -0300
Subject: [PATCH] Use liboxenc-dev in ci jobs

---
 .drone.jsonnet          |  15 +++++++++++++--
 contrib/deb.oxen.io.gpg | Bin 0 -> 2213 bytes
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 contrib/deb.oxen.io.gpg

diff --git a/.drone.jsonnet b/.drone.jsonnet
index cccd81e..522d403 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,6 +1,6 @@
 local docker_base = 'registry.oxen.rocks/lokinet-ci-';
 
-local default_deps_nocxx = ['libsodium-dev', 'libzmq3-dev'];
+local default_deps_nocxx = ['libsodium-dev', 'libzmq3-dev', 'liboxenc-dev'];
 
 local submodule_commands = ['git fetch --tags', 'git submodule update --init --recursive --depth=1'];
 
@@ -12,7 +12,14 @@ local submodules = {
 
 local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q ';
 
-local debian_pipeline(name, image, arch='amd64', deps=['g++'] + default_deps_nocxx, cmake_extra='', build_type='Release', extra_cmds=[], allow_fail=false) = {
+local debian_pipeline(name,
+                      image,
+                      arch='amd64',
+                      deps=['g++'] + default_deps_nocxx,
+                      cmake_extra='',
+                      build_type='Release',
+                      extra_cmds=[],
+                      allow_fail=false) = {
   kind: 'pipeline',
   type: 'docker',
   name: name,
@@ -30,6 +37,10 @@ local debian_pipeline(name, image, arch='amd64', deps=['g++'] + default_deps_noc
         'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
         apt_get_quiet + 'update',
         apt_get_quiet + 'install -y eatmydata',
+        'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y lsb-release',
+        'cp contrib/deb.oxen.io.gpg /etc/apt/trusted.gpg.d',
+        'echo deb http://deb.oxen.io $$(lsb_release -sc) main >/etc/apt/sources.list.d/oxen.list',
+        'eatmydata ' + apt_get_quiet + ' update',
         'eatmydata ' + apt_get_quiet + 'dist-upgrade -y',
         'eatmydata ' + apt_get_quiet + 'install -y cmake git ninja-build pkg-config ccache ' + std.join(' ', deps),
         'mkdir build',
diff --git a/contrib/deb.oxen.io.gpg b/contrib/deb.oxen.io.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..6ec4e25ad9a5f27c4cf558a455888e8087153f9d
GIT binary patch
literal 2213
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

literal 0
HcmV?d00001