Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ci-cleanup'

Browse Source 
Minor cleanup for the CI setup script.

See https://github.com/wxWidgets/wxWidgets/pull/2329
This commit is contained in:
Vadim Zeitlin
2021-04-16 23:32:21 +02:00
parent 16e0be9f26 f3b275321c
commit 9ef30e728a
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/tools/before_install.sh
View File

@@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# #
# This script is used by Travis CI to install the dependencies before building # This script is used by both GitHub and Travis CI to install the dependencies
# wxWidgets but can also be run by hand if necessary but currently it only # before building wxWidgets but can also be run by hand if necessary (but
# works for Ubuntu versions used by Travis builds. # currently it only works for Ubuntu versions used by the CI builds).
set -e set -e
@@ -14,8 +14,6 @@ case $(uname -s) in
# Show information about the repositories and priorities used. # Show information about the repositories and priorities used.
echo 'APT sources used:' echo 'APT sources used:'
$SUDO grep --no-messages '^[^#]' /etc/apt/sources.list /etc/apt/sources.list.d/* || true $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 ---' echo '--- End of APT files dump ---'
run_apt() { run_apt() {
@@ -37,11 +35,6 @@ case $(uname -s) in
# Note that this command works only on Ubuntu 18.04 LTS and newer. # Note that this command works only on Ubuntu 18.04 LTS and newer.
run_apt install -y ubuntu-dbgsym-keyring 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. # 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' dbgsym_pkgs='libfontconfig1-dbgsym libglib2.0-0-dbgsym libgtk-3-0-dbgsym libatk-bridge2.0-0-dbgsym'
fi fi