Add OSX settings for PR builds #3215
Conversation
|
Jenkins copyright check |
|
jenkins compile osx jdk11 |
2 similar comments
|
jenkins compile osx jdk11 |
|
jenkins compile osx jdk11 |
|
jenkins compile win jdk10 |
|
jenkins test sanity osx jdk8 |
|
jenkins test sanity osx jdk11 |
|
jenkins test sanity osx jdk11 |
|
jenkins test sanity osx jdk11 |
1 similar comment
|
jenkins test sanity osx jdk11 |
|
jenkins test sanity osx jdk11 @DanHeidinga, I included your change and made a slight change of my own after rebasing. Another build to make sure its still failing in the same location, or hopefully somewhere further along. |
|
jenkins test sanity osx jdk11 |
|
This looks OK to me for jdk11. jdk8 will likely require further changes but this is good enough to get started. @jdekonin Can you remove the wip? |
runtime/compiler/makefile.ftl
Outdated
| @@ -87,6 +87,9 @@ export BUILD_CONFIG?=prod | |||
| <#elseif uma.spec.id?starts_with("linux_arm_linaro")> | |||
| export PLATFORM=arm-linux-gcc-cross | |||
| </#if> | |||
| <#if uma.spec.id?starts_with("osx_x86-64")> | |||
| export PLATFORM=amd64-osx-clang | |||
There was a problem hiding this comment.
@jdekonin for JDK8, we need to set export PLATFORM=amd64-osx-gcc. Nazim is adding amd64-osx-gcc.mk via #3331.
fyi - @DanHeidinga @0xdaryl @nbhuiyan
| @@ -87,6 +87,9 @@ export BUILD_CONFIG?=prod | |||
| <#elseif uma.spec.id?starts_with("linux_arm_linaro")> | |||
| export PLATFORM=arm-linux-gcc-cross | |||
| </#if> | |||
| <#if uma.spec.id?starts_with("osx_x86-64")> | |||
There was a problem hiding this comment.
Maybe try something like
<#if uma.buildinfo.version.major == 8>
export PLATFORM=amd64-osx-gcc
<#else>
export PLATFORM=amd64-osx-clang
</#if>
There was a problem hiding this comment.
Rebased and updated to handle v8 difference.
jdekonin
force-pushed
the
master
branch
2 times, most recently
from
b634063 to
a42367d
Compare
|
jenkins test sanity osx jdk11 |
runtime/compiler/makefile.ftl
Outdated
| @@ -87,6 +87,13 @@ export BUILD_CONFIG?=prod | |||
| <#elseif uma.spec.id?starts_with("linux_arm_linaro")> | |||
| export PLATFORM=arm-linux-gcc-cross | |||
| </#if> | |||
| <#if uma.spec.id?starts_with("osx_x86-64")> | |||
| <#if uma.buildinfo.version.major == 8> | |||
There was a problem hiding this comment.
@jdekonin this syntax is incorrect. the CI builds are failing because they are unable to generate runtime/compiler/makefile:
==> if-else [on line 91, column 3 in compiler/makefile.ftl]
11:45:47 Java backtrace for programmers:
11:45:47 ----------
11:45:47 freemarker.template.TemplateException: The only legal comparisons are between two numbers, two strings, or two dates.
11:45:47 Left hand operand is a freemarker.template.SimpleScalar
11:45:47 Right hand operand is a freemarker.template.SimpleNumber
11:45:47
11:45:47 at freemarker.core.ComparisonExpression.isTrue(ComparisonExpression.java:182)
11:45:47 at freemarker.core.IfBlock.accept(IfBlock.java:80)
11:45:47 at freemarker.core.Environment.visit(Environment.java:196)
11:45:47 at freemarker.core.ConditionalBlock.accept(ConditionalBlock.java:79)
11:45:47 at freemarker.core.Environment.visit(Environment.java:196)
11:45:47 at freemarker.core.MixedContent.accept(MixedContent.java:92)
11:45:47 at freemarker.core.Environment.visit(Environment.java:196)
11:45:47 at freemarker.core.Environment.process(Environment.java:176)
11:45:47 at freemarker.template.Template.process(Template.java:232)
11:45:47 at com.ibm.uma.UMA.generate(UMA.java:215)
11:45:47 at com.ibm.j9.uma.Main.main(Main.java:277)
11:45:47
11:45:47 freemarker.template.TemplateException: The only legal comparisons are between two numbers, two strings, or two dates.
11:45:47 Left hand operand is a freemarker.template.SimpleScalar
11:45:47 Right hand operand is a freemarker.template.SimpleNumber
Also, uma.buildinfo.version.major is not set. This check won't work even if we fix the syntax.
The correct way is the following:
<#if uma.spec.id?starts_with("osx_x86-64")>
ifeq ($(VERSION_MAJOR),8)
export PLATFORM=amd64-osx-gcc
else
export PLATFORM=amd64-osx-clang
endif
</#if>
There was a problem hiding this comment.
Thanks @babsingh, I was planning on asking you to test that out.
* [skip ci] * JDK8 and JDK11 only Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com>
* [skip ci] * related to eclipse-openj9#3331 Signed-off-by: Joe deKoning <joe_dekoning@ca.ibm.com>
|
Latest update should resolve the uma makefile generation issue that the travis build hit. I also removed the change that enabled OSX in the nightly builds. If these commits in the current form are acceptable, then its ready. jenkins test sanity osx jdk11 |
jdekonin
changed the title
|
Merging as this as it allows PR builds to compile. The failures are due to test related code and are outside the scope of this PR. |
Signed-off-by: Joe deKoning joe_dekoning@ca.ibm.com
#3124