From 958935b460f292f68eaab2dfd8662de9774fc638 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 13 Sep 2016 13:12:22 -0700
Subject: [PATCH] ci.hocon: add Mac gate
---
ci.hocon | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/ci.hocon b/ci.hocon
index 87a87364eb..4e44a4cf6f 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -1,6 +1,14 @@
java7 : {name : oraclejdk, version : "7", platformspecific: true}
#java8 : {name : oraclejdk, version : "8u66", platformspecific: true}
java8 : {name : labsjdk, version : "8u92-jvmci-0.20", platformspecific: true}
+logfiles : [
+ "fastr_errors.log"
+ "com.oracle.truffle.r.native/gnur/R-*/gnur_configure.log"
+ "com.oracle.truffle.r.native/gnur/R-*/gnur_make.log"
+ "com.oracle.truffle.r.native/gnur/R-*/Makeconf"
+ "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_configure.log"
+ "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_make.log"
+ ]
common : {
packages : {
@@ -14,14 +22,7 @@ common : {
}
environment : {
}
- logs : [
- "fastr_errors.log"
- "com.oracle.truffle.r.native/gnur/R-*/gnur_configure.log"
- "com.oracle.truffle.r.native/gnur/R-*/gnur_make.log"
- "com.oracle.truffle.r.native/gnur/R-*/Makeconf"
- "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_configure.log"
- "com.oracle.truffle.r.native/gnur/libiconv-*/iconv_make.log"
- ]
+ logs: ${logfiles}
timelimit : "1:00:00"
}
@@ -42,6 +43,24 @@ gateTest : ${common} ${java8Downloads} {
]
}
+gateTestDarwin : ${java8Downloads} {
+ packages : {
+ "pip:astroid" : "==1.1.0"
+ "pip:pylint" : "==1.1.0"
+ "xz" : ""
+ }
+ environment : ${common.environment} {
+ PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH"
+ F77: "/usr/local/bin/gfortran-4.9"
+ }
+ logs: ${logfiles}
+ timelimit : "1:00:00"
+
+ run : [
+ ${gateCmd} ["Versions,JDKReleaseInfo,Pylint,Canonicalization Check,BuildJavaWithJavac,UnitTests: ExpectedTestOutput file check,UnitTests"]
+ ]
+}
+
gateStyle : ${common} {
# need pyhocon fix
downloads : {
@@ -71,6 +90,7 @@ rbcheck : ${common} ${java8Downloads} {
builds = [
${gateTest} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-test-linux-amd64"}
${gateStyle} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-style-linux-amd64"}
+ ${gateTestDarwin} {capabilities : [darwin, amd64], targets : [gate, post-merge], name: "gate-test-darwin-amd64"}
${rbcheck} {capabilities : [linux, amd64], targets : [gate, post-merge], name: "gate-rbcheck-linux-amd64"}
# ${gateTest} {capabilities : [linux, sparcv9], targets : [gate, post-merge], name: "gate-test-linux-sparcv9"}
]
--
GitLab