only use openjdk7 for java extended test, use openjdk8 for all others

This commit is contained in:
Eric Vergnaud 2019-07-14 11:05:46 +08:00
parent eac9b0b0ef
commit 9b32885e21
1 changed files with 6 additions and 10 deletions

View File

@ -20,7 +20,7 @@ matrix:
include: include:
- os: linux - os: linux
compiler: clang compiler: clang
jdk: openjdk7 jdk: openjdk8
env: env:
- TARGET=cpp - TARGET=cpp
- CXX=g++-5 - CXX=g++-5
@ -37,7 +37,7 @@ matrix:
- clang-3.7 - clang-3.7
- os: linux - os: linux
compiler: clang compiler: clang
jdk: openjdk7 jdk: openjdk8
env: env:
- TARGET=cpp - TARGET=cpp
- CXX=g++-5 - CXX=g++-5
@ -54,7 +54,7 @@ matrix:
- clang-3.7 - clang-3.7
- os: linux - os: linux
compiler: clang compiler: clang
jdk: openjdk7 jdk: openjdk8
env: env:
- TARGET=cpp - TARGET=cpp
- CXX=g++-5 - CXX=g++-5
@ -140,16 +140,12 @@ matrix:
jdk: openjdk7 jdk: openjdk7
env: TARGET=java env: TARGET=java
stage: extended-test stage: extended-test
- os: linux
jdk: openjdk8
env: TARGET=java
stage: extended-test
- os: linux - os: linux
jdk: openjdk8 jdk: openjdk8
env: TARGET=java env: TARGET=java
stage: smoke-test stage: smoke-test
- os: linux - os: linux
jdk: openjdk7 jdk: openjdk8
env: TARGET=csharp env: TARGET=csharp
stage: main-test stage: main-test
- os: linux - os: linux
@ -174,11 +170,11 @@ matrix:
- GROUP=RECURSION - GROUP=RECURSION
stage: extended-test stage: extended-test
- os: linux - os: linux
jdk: openjdk7 jdk: openjdk8
env: TARGET=python2 env: TARGET=python2
stage: main-test stage: main-test
- os: linux - os: linux
jdk: openjdk7 jdk: openjdk8
env: TARGET=python3 env: TARGET=python3
addons: addons:
apt: apt: