From 58efb51c07716b32c3d2b4a2d1a361ba9d52972c Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Tue, 24 Jan 2017 13:56:40 -0500 Subject: [PATCH 1/3] - attempt forced JDK version setting for travis build --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index a6815b8b5..1dbebb971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,10 @@ branches: except: - latest-master +# Force set JDK version +jdk: + - oraclejdk7 + before_install: - export BUILD_PSP=YES - export BUILD_ANDROID=YES From 9fe5ac1994dea443cad1cb11c39f380409204df2 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Tue, 24 Jan 2017 14:51:03 -0500 Subject: [PATCH 2/3] - attempt forced JVM version setting for travis build --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1dbebb971..6382fc0cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ branches: except: - latest-master -# Force set JDK version -jdk: - - oraclejdk7 +# Force set JDK version (didnt work since it is not used in build) +#jdk: +# - oraclejdk7 before_install: - export BUILD_PSP=YES @@ -56,6 +56,7 @@ install: env: global: + - JAVA_HOME=/usr/lib/jvm/java-7-oracle # Force set JVM version - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" From f8009672e95283dea3dc713f5f4ff1ee9e71c652 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Tue, 24 Jan 2017 15:30:34 -0500 Subject: [PATCH 3/3] - Travis build fix cleanup --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6382fc0cb..6cb937026 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,6 @@ branches: except: - latest-master -# Force set JDK version (didnt work since it is not used in build) -#jdk: -# - oraclejdk7 - before_install: - export BUILD_PSP=YES - export BUILD_ANDROID=YES @@ -56,7 +52,7 @@ install: env: global: - - JAVA_HOME=/usr/lib/jvm/java-7-oracle # Force set JVM version + - JAVA_HOME=/usr/lib/jvm/java-7-oracle # Force set JVM version to comply with Travis Ant version (1.8.2) - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA="