Unverified Commit 8f0a578a authored by Rafael Kitover's avatar Rafael Kitover
Browse files

travis update attempt 2

Use `xvfb` as per instructions at:

https://docs.travis-ci.com/user/gui-and-headless-browsers/



to run the `--help` check on linux.

Try https url for `pkg.mxe.cc`.
Signed-off-by: default avatarRafael Kitover <rkitover@gmail.com>
parent dbd1d8c1
---
sudo: required
services:
- xvfb
matrix:
fast_finish: true
include:
......@@ -15,7 +18,7 @@ matrix:
- cd build
- cmake ..
- make -j2
- ./visualboyadvance-m --help
- xvfb-run ./visualboyadvance-m --help
cache:
directories:
- "$HOME/.ccache"
......
......@@ -306,7 +306,7 @@ debian_installdeps() {
apt_ssl_exceptions=/etc/apt/apt.conf.d/80ssl-exceptions
if ! grep -q 'pkg\.mxe\.cc' $apt_ssl_exceptions; then
if ! grep -q 'pkg\.mxe\.cc' $apt_ssl_exceptions 2>/dev/null; then
sudo sh -c "cat >> $apt_ssl_exceptions" <<EOF
Acquire::https::${debian_rel}.mxe.cc::Verify-Peer "false";
Acquire::https::${debian_rel}.mxe.cc::Verify-Host "false";
......@@ -318,7 +318,7 @@ EOF
sudo apt-get -qq update
if [ -z "$(apt-cache search '^mxe-source$')" ]; then
if [ ! -f "$mxe_apt_sources" ]; then
echo "deb http://pkg.mxe.cc/repos/apt/dists $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
echo "deb https://pkg.mxe.cc/repos/apt/dists $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
check sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
else
error "$mxe_apt_sources exists but mxe packages are not found in apt, either delete it or fix it"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment