Skip to content

Commit fa1fef0

Browse files
committed
.travis.yml: switch to bionic to restore i386 builds with gcc8 (fixes OSGeo#2175)
Credits to @sebastic for his suggestion to try bionic and use aptitude instead of apt !
1 parent 974b0db commit fa1fef0

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.travis.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,23 @@ matrix:
3030
- g++-4.8
3131

3232
- os: linux
33-
dist: xenial
33+
dist: bionic
3434
compiler: gcc
3535
services:
3636
- docker
3737
env:
3838
- BUILD_NAME=linux_gcc8
3939
- DETAILS="linux, gcc8"
40-
- ARCH=amd64
41-
# - DETAILS="linux, gcc8, i386"
42-
# - ARCH=i386
40+
- DETAILS="linux, gcc8, i386"
41+
- ARCH=i386
4342
- CC=gcc-8
4443
- CXX=g++-8
45-
- CXXFLAGS='-g -O2 -D_GLIBCXX_ASSERTIONS'
46-
# - CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS'
47-
# - CFLAGS='-g -O2 -m32'
48-
# - TIFF_CFLAGS=-I/usr/include/i386-linux-gnu
49-
# - TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff"
50-
# - SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu
51-
# - SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3"
44+
- CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS'
45+
- CFLAGS='-g -O2 -m32'
46+
- TIFF_CFLAGS=-I/usr/include/i386-linux-gnu
47+
- TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff"
48+
- SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu
49+
- SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3"
5250
addons:
5351
apt:
5452
sources:

travis/linux_gcc8/before_install.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ set -e
55
./travis/before_install_apt.sh
66
./travis/before_install_pip.sh
77

8-
sudo apt-get install -qq \
8+
sudo aptitude remove -q -y libtiff-dev libcurl4-gnutls-dev
9+
sudo aptitude install -q -y \
910
lcov \
1011
doxygen graphviz \
1112
sqlite3 libsqlite3-dev:$ARCH \

0 commit comments

Comments
 (0)