Skip to content

Commit e345c1a

Browse files
committed
Switch to AdoptOpenJDK 11.0.7
1 parent b5fb6cd commit e345c1a

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
language: java
2-
jdk:
3-
- openjdk11
4-
51
services:
62
- docker
73

@@ -20,6 +16,7 @@ before_install:
2016
- curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > /tmp/docker-compose
2117
- chmod +x /tmp/docker-compose
2218
- sudo mv /tmp/docker-compose /usr/local/bin
19+
- ./ci/install-jdk.sh
2320
- APP_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG#*v}" || echo "${TRAVIS_BRANCH##*/}")
2421
- DOCKER_IMAGE_VERSION=$([ -n "${TRAVIS_TAG}" ] && echo "${TRAVIS_TAG}" || echo "${TRAVIS_BRANCH##*/}")
2522

@@ -32,7 +29,7 @@ install:
3229

3330
script:
3431
- chmod +x gradlew && ./gradlew inttest --tests com.faforever.api.clan.ClanControllerTest
35-
# - chmod +x gradlew && ./gradlew ${GRADLE_CLI_OPTS} build -Pversion=${APP_VERSION}
32+
- chmod +x gradlew && ./gradlew ${GRADLE_CLI_OPTS} build -Pversion=${APP_VERSION}
3633

3734
after_success:
3835
- ./gradlew ${GRADLE_CLI_OPTS} jacocoTestReport coveralls

ci/installjdk.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
if test -d "~/$JDK"; then
4+
echo "already installed"
5+
exit 0
6+
fi
7+
8+
mkdir -p ~/bin
9+
url="https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh"
10+
wget "$url" -P ~/bin/ || {
11+
echo "${ANSI_RED}Could not acquire install-jdk.sh. Stopping build.${ANSI_RESET}" >/dev/stderr
12+
exit 2
13+
}
14+
chmod +x ~/bin/install-jdk.sh
15+
export JAVA_HOME="~/$JDK"
16+
~/bin/install-jdk.sh --url "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz" --target "$JAVA_HOME" --workspace "$TRAVIS_HOME/.cache/install-jdk" --cacerts

0 commit comments

Comments
 (0)