From c040f01af2fc1da55b758ef6e1aae3d9f73ccee7 Mon Sep 17 00:00:00 2001 From: Joacim Breiler Date: Mon, 14 Jun 2021 10:46:31 +0200 Subject: [PATCH] Build fix (#1613) * Changed build environment linux distribution * Changed jdk in build script * JDK switcher does not work, try to set it as an configuration attribute. Only execute deploy scripts on winders repository. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bdd6b0fe..46587105d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ -dist: trusty +dist: focal language: java os: linux +jdk: openjdk13 # Prevent running default install script install: true @@ -11,9 +12,6 @@ cache: - "ugs-pendant/src/main/webapp/node" - "ugs-pendant/src/main/webapp/node_modules" -jdk: -- oraclejdk8 - before_script: - sudo apt-get update -qq - pip install --user codecov @@ -36,6 +34,7 @@ deploy: script: bash scripts/deploy.sh nightly skip_cleanup: true on: + repo: winder/Universal-G-Code-Sender branch: master tags: false @@ -44,6 +43,7 @@ deploy: script: bash scripts/deploy.sh $TRAVIS_TAG skip_cleanup: true on: + repo: winder/Universal-G-Code-Sender tags: true env: