Skip to content

Commit

Permalink
chore: add support for graalvm at jdk23 (#476)
Browse files Browse the repository at this point in the history
* chore: add support for graalvm at jdk23

- chore: add bindist entries for gvm23
- chore: update `pom.xml`
- chore: update maven deps to `24.1.0`
- chore: update codebase dependencies and pins
- chore: relock
- chore: prepare version bump → `0.12.0`
- test: add test for `graalvm-oracle-23`
- test: add test for `graalvm-ce-23`

Signed-off-by: Sam Gammon <[email protected]>

* fix: remove `incompatible_remote_results_ignore_disk`

Fixes and closes #409

Signed-off-by: Sam Gammon <[email protected]>

* chore(deps): bump org.graalvm.polyglot:polyglot from 24.0.1 to 24.1.0

Bumps [org.graalvm.polyglot:polyglot](https://github.com/oracle/graal) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](oracle/graal@vm-24.0.1...vm-24.1.0)

---
updated-dependencies:
- dependency-name: org.graalvm.polyglot:polyglot
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Sam Gammon <[email protected]>

* chore(deps): bump org.graalvm.sdk:graal-sdk from 24.0.1 to 24.1.0

Bumps [org.graalvm.sdk:graal-sdk](https://github.com/oracle/graal) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](oracle/graal@vm-24.0.1...vm-24.1.0)

---
updated-dependencies:
- dependency-name: org.graalvm.sdk:graal-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Sam Gammon <[email protected]>

* chore(deps): bump org.graalvm.nativeimage:native-image-base

Bumps [org.graalvm.nativeimage:native-image-base](https://github.com/oracle/graal) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](oracle/graal@vm-24.0.1...vm-24.1.0)

---
updated-dependencies:
- dependency-name: org.graalvm.nativeimage:native-image-base
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Sam Gammon <[email protected]>

* chore(deps): bump org.graalvm.compiler:compiler from 24.0.1 to 24.1.0

Bumps [org.graalvm.compiler:compiler](https://github.com/oracle/graal) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](oracle/graal@vm-24.0.1...vm-24.1.0)

---
updated-dependencies:
- dependency-name: org.graalvm.compiler:compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Sam Gammon <[email protected]>

* chore(deps): bump org.graalvm.nativeimage:svm from 24.0.1 to 24.1.0

Bumps [org.graalvm.nativeimage:svm](https://github.com/oracle/graal) from 24.0.1 to 24.1.0.
- [Release notes](https://github.com/oracle/graal/releases)
- [Commits](oracle/graal@vm-24.0.1...vm-24.1.0)

---
updated-dependencies:
- dependency-name: org.graalvm.nativeimage:svm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Sam Gammon <[email protected]>

---------

Signed-off-by: Sam Gammon <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
sgammon and dependabot[bot] authored Sep 29, 2024
1 parent 8d49aab commit cc62783
Show file tree
Hide file tree
Showing 34 changed files with 875 additions and 373 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ Makefile export-ignore
package.json export-ignore
example/ export-ignore
version.bazelrc export-ignore
maven_install.json linguist-generated=true
internal/graalvm_bindist_map.bzl linguist-generated=true
*/MODULE.bazel.lock linguist-generated=true
MODULE.bazel.lock linguist-generated=true
16 changes: 16 additions & 0 deletions .github/workflows/module.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,14 @@ jobs:
labs: false
skip: false

# Test: GVM CE 23
- label: GraalVM CE 23
target: sample
action: build
directory: "./example/integration_tests/graalvm-ce-23"
labs: false
skip: false

# Test: Oracle GVM 17
- label: Oracle GraalVM 17
target: sample
Expand Down Expand Up @@ -370,6 +378,14 @@ jobs:
labs: false
skip: false

# Test: Oracle GVM 23
- label: Oracle GraalVM 23
target: sample
action: build
directory: "./example/integration_tests/graalvm-oracle-23"
labs: false
skip: false

steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module(
name = "rules_graalvm",
version = "0.11.2",
version = "0.12.0",
)

## JVM version to target.
Expand All @@ -18,7 +18,7 @@ GRAALVM_VERSION = "21.0.2"
GRAALVM_DIST = "ce"

## GraalVM SDK version.
GRAALVM_SDK_VERSION = "24.0.1"
GRAALVM_SDK_VERSION = "24.1.0"

##
## Dependencies: API
Expand Down
458 changes: 229 additions & 229 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

---

> Latest release: [`0.11.2`](https://registry.bazel.build/modules/rules_graalvm)
> Latest release: [`0.12.0`](https://registry.bazel.build/modules/rules_graalvm)
Use [GraalVM](https://graalvm.org) with [Bazel](https://bazel.build) to:

Expand Down Expand Up @@ -45,18 +45,18 @@ Use [GraalVM](https://graalvm.org) with [Bazel](https://bazel.build) to:
**Via `WORKSPACE.bazel`:**

| Artifact | SHA256 |
| -------------------------- | ------------------------------------------------------------------ |
| `rules_graalvm-0.11.2.zip` | `3ef2f1583a4849d03209a43b0b507f172299c3045e585b6ffa7144a2bc12ae18` |
| `rules_graalvm-0.11.2.tgz` | `49bfa3851b6a1f76e5c18727adf6b0bb61af24ba2566bf75a724ddbca0c2c183` |
| Artifact | SHA256 |
| -------------------------- | ------ |
| `rules_graalvm-0.12.0.zip` | `` |
| `rules_graalvm-0.12.0.tgz` | `` |

```starlark
http_archive(
name = "rules_graalvm",
sha256 = "3ef2f1583a4849d03209a43b0b507f172299c3045e585b6ffa7144a2bc12ae18",
strip_prefix = "rules_graalvm-0.11.2",
sha256 = "",
strip_prefix = "rules_graalvm-0.12.0",
urls = [
"https://github.com/sgammon/rules_graalvm/releases/download/v0.11.2/rules_graalvm-0.11.2.zip",
"https://github.com/sgammon/rules_graalvm/releases/download/v0.12.0/rules_graalvm-0.12.0.zip",
],
)
```
Expand All @@ -69,8 +69,8 @@ load("@rules_graalvm//graalvm:repositories.bzl", "graalvm_repository")
graalvm_repository(
name = "graalvm",
distribution = "ce", # `oracle`, `ce`, or `community`
java_version = "22", # `17`, `20`, `21`, or `22` as supported by the version provided
version = "22.0.0", # gvm sdk version format like `24.x.x` also supported
java_version = "23", # `17`, `20`, `22`, `23`, etc.
version = "23.0.0", # pass graalvm or specific jdk version supported by gvm
)
```

Expand All @@ -86,23 +86,23 @@ register_graalvm_toolchains()

**Or, via `MODULE.bazel`:**

| Artifact | Integrity value |
| -------------------------- | ----------------------------------------------------- |
| `rules_graalvm-0.11.2.zip` | `sha256-PvLxWDpISdAyCaQ7C1B/FyKZwwReWFtv+nFEorwSrhg=` |
| `rules_graalvm-0.11.2.tgz` | `sha256-Sb+jhRtqH3blwYcnrfawu2GvJLolZr91pyTdvKDCwYM=` |
| Artifact | Integrity value |
| -------------------------- | --------------- |
| `rules_graalvm-0.12.0.zip` | `` |
| `rules_graalvm-0.12.0.tgz` | `` |

```starlark
bazel_dep(name = "rules_graalvm", version = "0.11.2")
bazel_dep(name = "rules_graalvm", version = "0.12.0")
```

```starlark
gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")

gvm.graalvm(
name = "graalvm",
version = "22.0.0", # gvm sdk version format like `24.x.x` also supported
version = "23.0.0", # pass graalvm or specific jdk version supported by gvm
distribution = "ce", # `oracle`, `ce`, or `community`
java_version = "22", # `17`, `20`, `21`, or `22` as supported by the version provided
java_version = "23", # `17`, `20`, `22`, `23`, etc.
)
use_repo(gvm, "graalvm")
register_toolchains("@graalvm//:jvm")
Expand Down
34 changes: 17 additions & 17 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

---

> Latest release: `0.11.2`
> Latest release: `0.12.0`
> **Important**
> Currently in beta. Feedback welcome but will probably break your build.
Expand All @@ -34,18 +34,18 @@ Use [GraalVM](https://graalvm.org) from [Bazel](https://bazel.build), with suppo
**Via `WORKSPACE.bazel`:**

| Artifact | SHA256 |
| -------------------------- | ------------------------------------------------------------------ |
| `rules_graalvm-0.11.2.zip` | `3ef2f1583a4849d03209a43b0b507f172299c3045e585b6ffa7144a2bc12ae18` |
| `rules_graalvm-0.11.2.tgz` | `49bfa3851b6a1f76e5c18727adf6b0bb61af24ba2566bf75a724ddbca0c2c183` |
| Artifact | SHA256 |
| -------------------------- | ------ |
| `rules_graalvm-0.12.0.zip` | `` |
| `rules_graalvm-0.12.0.tgz` | `` |

```python
http_archive(
name = "rules_graalvm",
sha256 = "3ef2f1583a4849d03209a43b0b507f172299c3045e585b6ffa7144a2bc12ae18",
strip_prefix = "rules_graalvm-0.11.2",
sha256 = "",
strip_prefix = "rules_graalvm-0.12.0",
urls = [
"https://github.com/sgammon/rules_graalvm/releases/download/v0.11.2/rules_graalvm-0.11.2.zip",
"https://github.com/sgammon/rules_graalvm/releases/download/v0.12.0/rules_graalvm-0.12.0.zip",
],
)
```
Expand All @@ -66,30 +66,30 @@ load("@rules_graalvm//graalvm:repositories.bzl", "graalvm_repository")
graalvm_repository(
name = "graalvm",
distribution = "ce", # `oracle`, `ce`, or `community`
java_version = "21", # `17`, `20`, or `21`, as supported by the version provided
version = "21.0.2", # earlier version format like `22.x` also supported
java_version = "23", # `17`, `20`, `22`, `23`, etc.
version = "23.0.0", # pass graalvm or specific jdk version supported by gvm
)
```

**Or, via `MODULE.bazel`:**

| Artifact | Integrity value |
| -------------------------- | ----------------------------------------------------- |
| `rules_graalvm-0.11.2.zip` | `sha256-PvLxWDpISdAyCaQ7C1B/FyKZwwReWFtv+nFEorwSrhg=` |
| `rules_graalvm-0.11.2.tgz` | `sha256-Sb+jhRtqH3blwYcnrfawu2GvJLolZr91pyTdvKDCwYM=` |
| Artifact | Integrity value |
| -------------------------- | --------------- |
| `rules_graalvm-0.12.0.zip` | `` |
| `rules_graalvm-0.12.0.tgz` | `` |

```python
bazel_dep(name = "rules_graalvm", version = "0.11.2")
bazel_dep(name = "rules_graalvm", version = "0.12.0")
```

```python
gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")

gvm.graalvm(
name = "graalvm",
version = "21.0.2", # earlier version format like `22.x` also supported
version = "23.0.0", # pass graalvm or specific jdk version supported by gvm
distribution = "ce", # `oracle`, `ce`, or `community`
java_version = "21", # `17`, `20`, or `21`, as supported by the version provided
java_version = "23", # `17`, `20`, `22`, `23`, etc.
)
use_repo(gvm, "graalvm")
register_toolchains("@graalvm//:jvm")
Expand Down
4 changes: 2 additions & 2 deletions example/integration_tests/bzlmod/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")
gvm.graalvm(
name = "graalvm",
distribution = "ce",
java_version = "22",
version = "22.0.1", # graalvm-ce-22 / graalvm-oracle-22 tests `22.0.2`
java_version = "23",
version = "23.0.0",
)
use_repo(
gvm,
Expand Down
18 changes: 9 additions & 9 deletions example/integration_tests/bzlmod/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions example/integration_tests/components-ce/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions example/integration_tests/components-oracle/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/integration_tests/graalvm-ce-23/.bazelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Nothing at this time.
1 change: 1 addition & 0 deletions example/integration_tests/graalvm-ce-23/.bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.3.1
1 change: 1 addition & 0 deletions example/integration_tests/graalvm-ce-23/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bazel-*
6 changes: 6 additions & 0 deletions example/integration_tests/graalvm-ce-23/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################
Loading

0 comments on commit cc62783

Please sign in to comment.