Travis: fix a debootstrap error from missing keyrings

Uses 18.04's debian-archive-keyring to fix the missing keyrings.
Spekular · Apr 29, 2019 · 8bcdf06 · 8bcdf06
1 parent ca9a956
commit 8bcdf06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis/debian_pkgs.sha256 b/.travis/debian_pkgs.sha256
@@ -1,2 +1,3 @@
 314ef4af137903dfb13e8c3ef1e6ea56cfdb23808d52ec4f5f50e288c73610c5  pbuilder_0.229.1_all.deb
 fa82aa8ed3055c6f6330104deedf080b26778295e589426d4c4dd0f2c2a5defa  debootstrap_1.0.95_all.deb
+2ef4c09f7841b72f93412803ddd142f72658536dbfabe00e449eb548f432f3f8  debian-archive-keyring_2017.7ubuntu1_all.deb
diff --git a/.travis/linux.debian-sid.install.sh b/.travis/linux.debian-sid.install.sh
@@ -2,15 +2,16 @@
 set -e
 
 sudo apt-get install -y \
-	debian-archive-keyring \
 	dpkg \
 	pbuilder
 
 # work around a pbuilder bug which breaks ccache
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666525
+# and also missing signing keys in Trusty's debian-archive-keyring
 cd /tmp
 wget http://archive.ubuntu.com/ubuntu/pool/main/p/pbuilder/pbuilder_0.229.1_all.deb
 wget http://archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.95_all.deb
+wget http://archive.ubuntu.com/ubuntu/pool/universe/d/debian-archive-keyring/debian-archive-keyring_2017.7ubuntu1_all.deb
 sha256sum -c "$TRAVIS_BUILD_DIR/.travis/debian_pkgs.sha256"
-sudo dpkg -i pbuilder_0.229.1_all.deb debootstrap_1.0.95_all.deb
+sudo dpkg -i pbuilder_0.229.1_all.deb debootstrap_1.0.95_all.deb debian-archive-keyring_2017.7ubuntu1_all.deb
 cd "$OLDPWD"