Skip to content

Conversation

@daniel-stewart-qdt
Copy link
Contributor

Fix for the getAndAddInt() function to take an AllocatableValue.

@daniel-stewart-qdt
Copy link
Contributor Author

Not sure I understand the failures. It seems like maybe the JDK11 requirement is not getting met? Is there something I need to change in order to find the right JDK?

@dougxc
Copy link
Member

dougxc commented Jun 4, 2018

That looks like an error in .travis.yml. Can you please add a commit to this PR with this diff:

diff --git a/.travis.yml b/.travis.yml
index eb41c8c1648..b037907b63a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ jdk:
 env:
   global:
     - JVMCI_VERSION="jvmci-0.44"
-    - JVMCI_BASE_JDK8="openjdk-8u172"
+    - JDK8_UPDATE_VERSION="172"
   matrix:
     - JDK="jdk8" GATE="style,fullbuild"
     - JDK="jdk8" GATE="build,test"
@@ -59,9 +59,9 @@ install:
       if [ "${JDK}" == "jdk8" ]
       then
         JDK_TAR=${TRAVIS_BUILD_DIR}/../jdk.tar.gz
-        wget https://github.com/dougxc/openjdk8-jvmci-builder/releases/download/${JVMCI_VERSION}/${JVMCI_BASE_JDK8}-${JVMCI_VERSION}-linux-amd64.tar.gz -O ${JDK_TAR}
+        wget https://github.com/dougxc/openjdk8-jvmci-builder/releases/download/${JVMCI_VERSION}/openjdk-8u${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}-linux-amd64.tar.gz -O ${JDK_TAR}
         tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${JDK_TAR}
-        export JAVA_HOME=${TRAVIS_BUILD_DIR}/../${JVMCI_BASE_JDK8}-${JVMCI_VERSION}
+        export JAVA_HOME=${TRAVIS_BUILD_DIR}/../openjdk1.8.0_${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}
       fi

 script:

@sanzinger
Copy link
Contributor

I am currently integrating this fix.

@dougxc
Copy link
Member

dougxc commented Jun 4, 2018

Did you see my comment above @sanzinger on the fix needed for the Travis failure?

@daniel-stewart-qdt
Copy link
Contributor Author

I did. I assume that is still needed even though @sanzinger is integrating?

@dougxc
Copy link
Member

dougxc commented Jun 4, 2018

I've canceled the integration so that you can push the change I suggested to ensure it fixes the Travis issue.

@sanzinger
Copy link
Contributor

Wow, I was even able to update the branch in your repository fork.

@oracle oracle deleted a comment from graalvmbot Jun 4, 2018
@dougxc dougxc merged commit 0f2487d into oracle:master Jun 5, 2018
@daniel-stewart-qdt daniel-stewart-qdt deleted the fixForGetAndAdd branch June 6, 2018 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants