From 15aaf9a163cd93c5bd71a4d6df26d29ca6d90738 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Apr 2021 19:10:16 +0200 Subject: [PATCH 1/3] Stop installing debug repository apt key manually This shouldn't be necessary any longer, as the corresponding Ubuntu bug (https://bugs.launchpad.net/bugs/1920640) is supposed to be fixed. --- build/tools/before_install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh index 9600cc2739..88a9a733bd 100755 --- a/build/tools/before_install.sh +++ b/build/tools/before_install.sh @@ -37,11 +37,6 @@ case $(uname -s) in # Note that this command works only on Ubuntu 18.04 LTS and newer. run_apt install -y ubuntu-dbgsym-keyring - # The key in the package above is currently (2021-03-22) out of - # date, so get the latest key manually (this is completely - # insecure, of course, but we don't care). - wget -O - http://ddebs.ubuntu.com/dbgsym-release-key.asc | $SUDO apt-key add - - # Install the symbols to allow LSAN suppression list to work. dbgsym_pkgs='libfontconfig1-dbgsym libglib2.0-0-dbgsym libgtk-3-0-dbgsym libatk-bridge2.0-0-dbgsym' fi From 994400eb17dfd3ba98af23a8a89c4118ef8a4b3a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Apr 2021 19:13:00 +0200 Subject: [PATCH 2/3] Don't dump apt preferences in the CI build logs This doesn't seem very useful and results in a lot of output. --- build/tools/before_install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh index 88a9a733bd..8c3f9d6ab2 100755 --- a/build/tools/before_install.sh +++ b/build/tools/before_install.sh @@ -14,8 +14,6 @@ case $(uname -s) in # Show information about the repositories and priorities used. echo 'APT sources used:' $SUDO grep --no-messages '^[^#]' /etc/apt/sources.list /etc/apt/sources.list.d/* || true - echo 'APT preferences:' - $SUDO grep --no-messages '^[^#]' /etc/apt/preferences /etc/apt/preferences.d/* || true echo '--- End of APT files dump ---' run_apt() { From f3b275321cb33f68eb0f685db9b54785aa035eaf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Apr 2021 19:23:28 +0200 Subject: [PATCH 3/3] Update comment to mention GitHub CI too No real changes. --- build/tools/before_install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh index 8c3f9d6ab2..541aafb95d 100755 --- a/build/tools/before_install.sh +++ b/build/tools/before_install.sh @@ -1,8 +1,8 @@ #!/bin/sh # -# This script is used by Travis CI to install the dependencies before building -# wxWidgets but can also be run by hand if necessary but currently it only -# works for Ubuntu versions used by Travis builds. +# This script is used by both GitHub and Travis CI to install the dependencies +# before building wxWidgets but can also be run by hand if necessary (but +# currently it only works for Ubuntu versions used by the CI builds). set -e