From e1d45f247dbbbaa2f14486f33680260410e8b1c8 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Tue, 19 Oct 2021 16:35:06 -0300 Subject: [PATCH] update deb repo signature filename --- .drone.jsonnet | 72 ++++++++++++++++++------------------ debian/deb.loki.network.gpg | Bin 2213 -> 0 bytes 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 debian/deb.loki.network.gpg diff --git a/.drone.jsonnet b/.drone.jsonnet index 0afd83246..37bdab389 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,50 +1,50 @@ -local distro = "bullseye"; +local distro = 'bullseye'; local distro_name = 'Debian bullseye'; local distro_docker = 'debian:bullseye'; 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 ..', - '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 ..', + "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 6ec4e25ad9a5f27c4cf558a455888e8087153f9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2213 zcmV;W2wL}<0u2OKF+Xtu5CE?&fm>>)yi@QSe>CUvyh@(yR~rMoHPnm@yQ)}lpqkMf zD?8<&y2iLh@H(Ncc^4S;)>v2`VyM%K48uy?Hm4i`cW^n<9xI`P`k|xhmc>GxhsBVaU3%-K%Fsi@4anlD}?+XzVZtkUWlK9Oy%mk zK7NJ7?iE9>EM#<>R_NBkXI4vd5`1Gj8c8HH-FT86?#Gj^%?08cQf1IR5jG%#ZXgKD zg+Wm2dD1nIZw1&kNqF&k4y1w3T?Z!kOVBFE$wZE|I{8`aD5(CY7o+UJ`tv_;u9n%H zLS2uAMJ~0yKh)T8i(NpiJ{GDQvMlARUq%>H-AVyWlL=<0++mOSL2=r#=q5_e&WBf; zo&cKEaSF{7hOIr}DX^5LQn;H*IyF_fD_aFKZ_sf)Ym5_koQX6yb{5@~!lTDQ<^?VT zVo*=fO@xy|MABwa>{N&SlGJ~huxV7Pn_x{@UMePG_`syb`&$w4v&h{cr;FlK-#A>D z*0tfCuxf-a)w(5@t{0-vrJ;fjb;tglI<`T{ID6>1juEPmvTExc^@koU#T15Y}5 z3~z8-&kGw-w@s&0VZR?_NNKBxqMH3i+@}mt`|88~?KFm>Tjd5%y!(vW1aJT{p6v=P zP@;vjY{;5gEvo<#0RRECCQ4y*Z*Cw`XlZU`Y+-I>WpW@qYGHG4Za`^mVP|P>VRCsc zV_`mt0yqQ{0RjLb1p-zvKXC#Z0|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f?2@u4Y zEa#|=LSko35B@W1W>tT)7-CsDjswdHnH&BedhVRfMKUq~nh`E@@ORw+{kDqoYyN@! zv#Q3XiR0yopGKib1^oxCZLVf5L2Jq-{BS@h4qAgo`gIU5u z3nOqmW;@|rm3j*7wg^ow8P%~v?nE8%c^gm^Se&vRS zn(HdcusYW?Xj|3iST3E%P`n#rK%=t}*OxHHHf*%LoP5m&xX^C(4{MgfP?wTHwCG!N z3N*Q6#p){(kK;L73f`Pm)tT*AB8@_2V$E(!Y%5vb>gFK_%xpKpx9z*RjSaMn0jW~ z4*AeBu^e5Z`LSf*3t&sUbXXHNS<|H3XZ!00r*GIMm(r5I)ucUp*m^EQ)<`#6 zE*&R?6q%5idYuu)WK~YtKAJw4i^hWl;L=n1HDh*b1>Z#(?DPEacNHqunS2=ZD`e8299CYx~rbxm&e9Ypjw&6RWWo0xevuI#5Y4v zg7rl1xZsxECMmVcJ{a(f$$%5b5@jJ`FT0Rjmm3bHoe{=}WmJkT(L zTdoAcYT@XJCaEd}4~t+Fp6OY9zmyjI1E>1i8xX?$ERz{#`AKNn09 zn|>{TqRl@|vyy;v?sno*#LE+q$cNQ%re3_6a~0olmz)^0IlkdT?ZJ$NF9MCa9Zq31 z0CWd+&oxI*h_%@gf;#r)aV=3aMq-o$#iYHG1&XdPa>MBAQ>$C2IZ89ZPRy~}oNlIEZ)O@& zTAQzFr0$^a2iHSM2)P#AGGz4gglF!^bwg4<5h4{O2DQ>GoDE!hzSQFIM(+u+{Yd12 zQ9#higkbklZ`(i{z`>sATHHV8DP_vp+Ay4#6dr=F+BM|@FPRe4jyZi_EWv@^(kR-O z|CSgF*+&*w@C?x?uU3p7^im$a6U$0ZvQi0%{|rtN!nDA|ok|BysaU%9aEB5@BBiDq nq1%?36-cF__u)W3ywPi5!&0SfcP(HNlEj8=N;Vhp-76(J2Bs0L