diff --git a/.drone.jsonnet b/.drone.jsonnet index a36988a22..e63120a1e 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,51 +1,51 @@ -local distro = "bionic"; +local distro = 'bionic'; local distro_name = 'Ubuntu 18.04'; local distro_docker = 'ubuntu:bionic'; local apt_get_quiet = 'apt-get -o=Dpkg::Use-Pty=0 -q'; -local repo_suffix = '/staging'; // can be /beta or /staging for non-primary repo deps +local repo_suffix = '/staging'; // 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 --depth=1'] + name: 'submodules', + image: 'drone/git', + commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=1'], }; 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 "Building on ${DRONE_STAGE_MACHINE}"', - 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections', - 'echo deb http://deb.loki.network' + repo_suffix + ' ' + distro + ' main >/etc/apt/sources.list.d/loki.list', - 'cp debian/deb.loki.network.gpg /etc/apt/trusted.gpg.d', - 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 ccache openssh-client', - 'cd debian', - 'eatmydata mk-build-deps -i -r --tool="' + apt_get_quiet + ' -o Debug::pkgProblemResolver=yes --no-install-recommends -y" control', - 'cd ..', - 'patch -i debian/dh-lib.patch /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm', # patch debian bug #897569 - 'eatmydata gbp buildpackage --git-no-pbuilder --git-builder=\'debuild --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 "Building on ${DRONE_STAGE_MACHINE}"', + 'echo "man-db man-db/auto-update boolean false" | debconf-set-selections', + 'echo deb http://deb.oxen.io' + repo_suffix + ' ' + distro + ' main >/etc/apt/sources.list.d/oxen.list', + 'cp contrib/deb.oxen.io.gpg /etc/apt/trusted.gpg.d', + 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 ccache openssh-client', + 'cd debian', + 'eatmydata mk-build-deps -i -r --tool="' + apt_get_quiet + ' -o Debug::pkgProblemResolver=yes --no-install-recommends -y" control', + 'cd ..', + 'patch -i debian/dh-lib.patch /usr/share/perl5/Debian/Debhelper/Dh_Lib.pm', // patch debian bug #897569 + "eatmydata gbp buildpackage --git-no-pbuilder --git-builder='debuild --preserve-envvar=CCACHE_*' --git-upstream-tag=HEAD -us -uc -j" + jobs, + './debian/ci-upload.sh ' + distro + ' ' + debarch, + ], + }, + ], }; [ - deb_pipeline(distro_docker), - deb_pipeline("i386/" + distro_docker, buildarch='amd64', debarch='i386'), - 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('i386/' + distro_docker, buildarch='amd64', debarch='i386'), + deb_pipeline('arm64v8/' + distro_docker, buildarch='arm64', debarch='arm64', jobs=4), + deb_pipeline('arm32v7/' + distro_docker, buildarch='arm64', debarch='armhf', jobs=4), ] diff --git a/debian/deb.loki.network.gpg b/debian/deb.loki.network.gpg deleted file mode 100644 index 6ec4e25ad..000000000 Binary files a/debian/deb.loki.network.gpg and /dev/null differ