From 0048b00658aa9ea5dc75196a834ea223ed4224ac Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 15:48:00 +0300 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=D0=92=D1=82=D0=BE=D1=80=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- .travis.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 511511e3..c9a2bf26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: azul/zulu-openjdk:8 +image: frekele/java stages: - build diff --git a/.travis.yml b/.travis.yml index 9ce4fe87..e73f2373 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ language: java +jdk: + - oraclejdk8 # Use https (public access) instead of git for git-submodules. This modifies only Travis-CI behavior! # disable the default submodule logic git: From 2f345f78a80f917d76c2a87afed0e39190218bf8 Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 16:07:38 +0300 Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D0=BE=20=D1=82=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20travis=20ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e73f2373..b195f4ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: java -jdk: - - oraclejdk8 +dist: trusty # Use https (public access) instead of git for git-submodules. This modifies only Travis-CI behavior! # disable the default submodule logic git: