Install locales used by our tests in before_install.sh
Previously this was done in the GitHub CI script, but this isn't specific to GitHub, so do it in the common script to make these locales also available under Cirrus CI. Also switch to just installing locales-all instead of installing locales and then running locale-gen because this is simpler and actually works (locale-gen would have only worked if we modified /etc/locale.gen before running it, but we didn't).
This commit is contained in:
parent
ec03139362
commit
5ab36f825a
2 changed files with 4 additions and 7 deletions
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
|
|
@ -148,13 +148,12 @@ jobs:
|
|||
|
||||
# Explanation for installing some less obvious packages:
|
||||
# - coreutils contains nproc used in proc_count.sh called below.
|
||||
# - locales contains locale-gen also used below.
|
||||
# - Python can't be installed using the action as usual because
|
||||
# it installs an ABI-incompatible version, see (wrongly, IMO)
|
||||
# closed https://github.com/actions/setup-python/issues/370
|
||||
# - xvfb is used for running the GUI tests.
|
||||
apt-get update -qq
|
||||
apt-get install -qq coreutils ${compiler-g++} git locales make pkg-config python3 python3-pip sudo xvfb
|
||||
apt-get install -qq coreutils ${compiler-g++} git make pkg-config python3 python3-pip sudo xvfb
|
||||
;;
|
||||
|
||||
'')
|
||||
|
|
@ -223,10 +222,6 @@ jobs:
|
|||
|
||||
echo "wxMAKEFILE_CXXFLAGS=$wxMAKEFILE_CXXFLAGS $error_opts" >> $GITHUB_ENV
|
||||
|
||||
# Install locales used by our tests to run all the tests instead of
|
||||
# skipping them.
|
||||
sudo locale-gen de_DE.utf8 de_CH.utf8 en_US.utf8 fr_FR.utf8 sv_SE.utf8
|
||||
|
||||
./build/tools/before_install.sh
|
||||
|
||||
- name: Show build environment
|
||||
|
|
|
|||
|
|
@ -98,7 +98,9 @@ case $(uname -s) in
|
|||
libglu1-mesa-dev"
|
||||
esac
|
||||
|
||||
pkg_install="$pkg_install $libtoolkit_dev gdb ${WX_EXTRA_PACKAGES}"
|
||||
# Install locales used by our tests to run all the tests instead of
|
||||
# skipping them.
|
||||
pkg_install="$pkg_install $libtoolkit_dev gdb locales-all ${WX_EXTRA_PACKAGES}"
|
||||
|
||||
extra_deps="$extra_deps libcurl4-openssl-dev libsecret-1-dev libnotify-dev"
|
||||
for pkg in $extra_deps; do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue