Skip to content

Commit 97e4b2d

Browse files
authored
upgrade gcc for travis build (#1995)
1 parent 1892cdb commit 97e4b2d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
dist: xenial
1+
dist: trusty
22
sudo: required
33
language: java
44
jdk:
5+
- openjdk7
56
- oraclejdk8
67
before_install:
78
- wget -O stunnel.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.29.tar.gz

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,12 @@ release:
340340
make stop
341341

342342
travis-install:
343-
g++ --version
344-
sudo apt-get install -y build-essential
343+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
344+
sudo apt-get -y update
345+
sudo apt-get install -y gcc-8 g++-8
346+
cd /usr/bin ;\
347+
sudo ln -sf gcc-8 gcc ;\
348+
sudo ln -sf g++-8 g++
345349
[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch redis-git || true
346350
$(MAKE) -C redis-git clean
347351
$(MAKE) -C redis-git

0 commit comments

Comments
 (0)