From fec871dbdd03de409f93f5c2b64005bb9f4c17c3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 May 2020 10:40:28 -0700 Subject: Update base ubuntu from trusty(14.04)->xenial(16.04), update install logic for dmd --- .travis.yml | 2 +- .travis/install.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 122e8d1..f0d1b45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: trusty +dist: xenial language: python # Used: travis encrypt "chat.freenode.net#scons" --add notifications.irc diff --git a/.travis/install.sh b/.travis/install.sh index 843f3b6..2c07fc8 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -40,9 +40,14 @@ else sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git # dependencies for D tests - sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list - wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add - - sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin + sudo wget https://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list + sudo apt-get update --allow-insecure-repositories + sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring + sudo apt-get update && sudo apt-get install dmd-compiler dub + +# sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list +# wget -qO - https://dlang.org/d-keyring.gpg | sudo apt-key add - +# sudo apt-get update && sudo apt-get -y --allow-unauthenticated install dmd-bin # dependencies for ldc tests export SCONS_LDC_VERSION=1.21.0 -- cgit v0.12