Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libs.graaljs, libs.graalsdk and libs.truffleapi to 24.0.0 #7268

Merged
merged 4 commits into from
Apr 17, 2024
Merged

Update libs.graaljs, libs.graalsdk and libs.truffleapi to 24.0.0 #7268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9931c15
Truffle, GraalSDK and Polyglot libraries upgrade.
sdedic Apr 14, 2024
fd8fee0
Fixed endless loop searching for dependent graalvms.
sdedic Apr 14, 2024
fa2a8ee
Suppress Truffle warnings; do not require jvmci
sdedic Apr 14, 2024
05febf1
Test updates for Graaljs 24.0.0
sdedic Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,16 +249,7 @@ jobs:
- name: Commit Validation tests
run: .github/retry.sh ant $OPTS -Dcluster.config=$CLUSTER_CONFIG commit-validation

- name: Set up JDK 11 for core.network
uses: actions/setup-java@v4
if: matrix.java == 17 && success()
with:
java-version: 11
distribution: ${{ env.default_java_distribution }}

# TODO fails on 17+
- name: platform/core.network
if: matrix.java == 17 && success()
run: ant $OPTS -f platform/core.network test

- name: Create Test Summary
Expand Down Expand Up @@ -2632,9 +2623,9 @@ jobs:

- name: Setup GraalVM {{ matrix.graal }}
run: |
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java11-linux-amd64-${{ matrix.graal }}.tar.gz
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java17-linux-amd64-${{ matrix.graal }}.tar.gz
curl -L $URL | tar -xz
GRAALVM=`pwd`/graalvm-ce-java11-${{ matrix.graal }}
GRAALVM=`pwd`/graalvm-ce-java17-${{ matrix.graal }}
Comment on lines -2635 to +2628
Copy link
Member

@mbien mbien Apr 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for future reference (since I would forget this within a month): the test setup is still on an EOL release due to the fact that current releases do no longer offer all required language extension test dependencies.

CI is using 22.3.1 which is the last known release which supports the full set of extensions (NB tests need R, python, ruby and js):

graalvm-ce-java17-22.3.1]$ bin/gu available
Downloading: Component catalog from www.graalvm.org
ComponentId              Version             Component name                Stability                     Origin 
---------------------------------------------------------------------------------------------------------------------------------
espresso                 22.3.1              Java on Truffle               Supported                     github.com
espresso-llvm            22.3.1              Java on Truffle LLVM Java librSupported                     github.com
js                       22.3.1              Graal.js                      Supported                     github.com
llvm                     22.3.1              LLVM Runtime Core             Supported                     github.com
llvm-toolchain           22.3.1              LLVM.org toolchain            Supported                     github.com
native-image             22.3.1              Native Image                  Early adopter                 github.com
native-image-llvm-backend22.3.1              Native Image LLVM Backend     Early adopter (experimental)  github.com
nodejs                   22.3.1              Graal.nodejs                  Supported                     github.com
python                   22.3.1              GraalVM Python                Experimental                  github.com
R                        22.3.1              FastR                         Experimental                  github.com
ruby                     22.3.1              TruffleRuby                   Experimental                  github.com
visualvm                 22.3.1              VisualVM                      Experimental                  github.com
wasm                     22.3.1              GraalWasm                     Experimental                  github.com

I think this would be the current GraalVM 17 release:

graalvm-community-openjdk-17.0.9+9.1]$ bin/gu available
Downloading: Component catalog from www.graalvm.org
ComponentId              Version             Component name                Stability                     Origin 
---------------------------------------------------------------------------------------------------------------------------------
espresso                 23.0.2              Java on Truffle               Supported                     github.com
espresso-llvm            23.0.2              Java on Truffle LLVM Java librSupported                     github.com
icu4j                    23.0.2              ICU4J                         Supported                     github.com
js                       23.0.2              Graal.js                      Supported                     github.com
llvm                     23.0.2              LLVM Runtime Core             Supported                     github.com
llvm-toolchain           23.0.2              LLVM.org toolchain            Supported                     github.com
nodejs                   23.0.2.1            Graal.nodejs                  Supported                     github.com
regex                    23.0.2              TRegex                        Supported                     github.com
visualvm                 23.0.2              VisualVM                      Supported                     github.com

GraalVM releases based on JDK 21 or 22 don't even have gu anymore (#7248 (comment)).

echo "JAVA_HOME=$GRAALVM" >> $GITHUB_ENV

- name: Setup GraalVM Languages
Expand Down
9 changes: 7 additions & 2 deletions ide/libs.graalsdk.system/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
8E62643FD621053E00EE52D797C7FBD08D7FDEDC org.graalvm.sdk:graal-sdk:20.3.0
8968BDBE4058F4E6610AF0DC184BD885B236A2B1 org.graalvm.sdk:launcher-common:20.3.0
06055903437576484DCC6545AF995FF67E0A3B55 org.graalvm.sdk:launcher-common:24.0.0
335646EC205A3BCE0D518748D08A5C45900A9869 org.graalvm.shadowed:jline:24.0.0
26F391313D8B7A4376B0778EA32A075422FB70DD org.graalvm.polyglot:polyglot:24.0.0
E7FBA15F217232D59E2C7EBA0EE7480F8DBF32B7 org.graalvm.sdk:collections:24.0.0
B6BD5F7B8A375832A64E7BEA9F2AEED08E7AA9D1 org.graalvm.sdk:nativeimage:24.0.0
DEA1FD82AECD2B7776FDA84FE944C605B0A44339 org.graalvm.sdk:word:24.0.0
206525F96C8D47633769F7DD96ADE4C9253E1FD7 org.graalvm.sdk:jniutils:24.0.0
8 changes: 4 additions & 4 deletions ...sdk/external/graal-sdk-20.3.0-license.txt → ...tem/external/graal-sdk-24.0.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: Graal SDK and Truffle API
Description: Graal SDK and Truffle API
Name: Graal SDK and Truffle Runtime
Description: Graal SDK and Truffle Runtime
License: UPL
Origin: https://github.com/oracle/graal
Version: 20.3.0
Files: graal-sdk-20.3.0.jar launcher-common-20.3.0.jar
Version: 24.0.0
Files: launcher-common-24.0.0.jar collections-24.0.0.jar jniutils-24.0.0.jar nativeimage-24.0.0.jar polyglot-24.0.0.jar word-24.0.0.jar

Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.

Expand Down
40 changes: 40 additions & 0 deletions ide/libs.graalsdk.system/external/jline-24.0.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Name: JLine3 shaded for Graal
Description: JLine3 shaded for Graal
License: BSD-jline3
Origin: https://github.com/jline/jline3/tree/master
Version: 24.0.0

Copyright (c) 2002-2023, the original author or authors.
All rights reserved.

https://opensource.org/licenses/BSD-3-Clause

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with
the distribution.

Neither the name of JLine nor the names of its contributors
may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
3 changes: 2 additions & 1 deletion ide/libs.graalsdk.system/manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.graalsdk.system
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/graalsdk/system/Bundle.properties
OpenIDE-Module-Specification-Version: 1.23
OpenIDE-Module-Specification-Version: 1.24
OpenIDE-Module-Provides: org.netbeans.spi.scripting.EngineProvider
OpenIDE-Module-Package-Dependencies: org.graalvm.polyglot[Engine]
OpenIDE-Module-Java-Dependencies: Java > 17
28 changes: 26 additions & 2 deletions ide/libs.graalsdk.system/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,35 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/graal-sdk-20.3.0.jar</binary-origin>
<binary-origin>external/launcher-common-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/launcher-common-20.3.0.jar</binary-origin>
<binary-origin>external/jline-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/collections-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/jniutils-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/launcher-common-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/nativeimage-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/polyglot-24.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path></runtime-relative-path>
<binary-origin>external/word-24.0.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
9 changes: 7 additions & 2 deletions ide/libs.graalsdk/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
8E62643FD621053E00EE52D797C7FBD08D7FDEDC org.graalvm.sdk:graal-sdk:20.3.0
8968BDBE4058F4E6610AF0DC184BD885B236A2B1 org.graalvm.sdk:launcher-common:20.3.0
06055903437576484DCC6545AF995FF67E0A3B55 org.graalvm.sdk:launcher-common:24.0.0
335646EC205A3BCE0D518748D08A5C45900A9869 org.graalvm.shadowed:jline:24.0.0
26F391313D8B7A4376B0778EA32A075422FB70DD org.graalvm.polyglot:polyglot:24.0.0
E7FBA15F217232D59E2C7EBA0EE7480F8DBF32B7 org.graalvm.sdk:collections:24.0.0
B6BD5F7B8A375832A64E7BEA9F2AEED08E7AA9D1 org.graalvm.sdk:nativeimage:24.0.0
DEA1FD82AECD2B7776FDA84FE944C605B0A44339 org.graalvm.sdk:word:24.0.0
206525F96C8D47633769F7DD96ADE4C9253E1FD7 org.graalvm.sdk:jniutils:24.0.0
8 changes: 4 additions & 4 deletions ...i/external/truffle-api-20.3.0-license.txt → ...sdk/external/graal-sdk-24.0.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: Graal SDK and Truffle API
Description: Graal SDK and Truffle API
Name: Graal SDK and Truffle Runtime
Description: Graal SDK and Truffle Runtime
License: UPL
Origin: https://github.com/oracle/graal
Version: 20.3.0
Files: truffle-api-20.3.0.jar
Version: 24.0.0
Files: launcher-common-24.0.0.jar collections-24.0.0.jar jniutils-24.0.0.jar nativeimage-24.0.0.jar polyglot-24.0.0.jar word-24.0.0.jar

Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.

Expand Down
40 changes: 40 additions & 0 deletions ide/libs.graalsdk/external/jline-24.0.0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Name: JLine3 shaded for Graal
Description: JLine3 shaded for Graal
License: BSD-jline3
Origin: https://github.com/jline/jline3/tree/master
Version: 24.0.0

Copyright (c) 2002-2023, the original author or authors.
All rights reserved.

https://opensource.org/licenses/BSD-3-Clause

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with
the distribution.

Neither the name of JLine nor the names of its contributors
may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 4 additions & 2 deletions ide/libs.graalsdk/manifest.mf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.graalsdk
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/graalsdk/Bundle.properties
OpenIDE-Module-Specification-Version: 1.24
OpenIDE-Module-Specification-Version: 1.25
OpenIDE-Module-Provides: org.netbeans.spi.scripting.EngineProvider
OpenIDE-Module-Recommends: com.oracle.truffle.polyglot.PolyglotImpl
OpenIDE-Module-Install: org/netbeans/libs/graalsdk/impl/Installer.class
OpenIDE-Module-Java-Dependencies: Java > 17
OpenIDE-Module-Hide-Classpath-Packages: org.graalvm.collections.**, org.graalvm.home.**, org.graalvm.nativeimage.**,
org.graalvm.options.**, org.graalvm.polyglot.**, org.graalvm.word.**
org.graalvm.options.**, org.graalvm.polyglot.**, org.graalvm.word.** jdk.vm.ci.services.**
Loading
Loading