Skip to content

Commit

Permalink
chore: support for latest gvm release
Browse files Browse the repository at this point in the history
- chore: add bindist mappings for jdk 22 (ce + oracle)
- chore: add version considerations for sdk `24.x.x`
- chore: add `genhash` script for generating a quick dist hash
- test: add integration test for ce on jdk22
- test: add integration test for oracle gvm on jdk22
- test: add new integration tests to ci

Signed-off-by: Sam Gammon <sam@elide.ventures>
  • Loading branch information
sgammon committed Apr 3, 2024
1 parent 79337d1 commit 9b7c67b
Show file tree
Hide file tree
Showing 23 changed files with 2,763 additions and 12 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/module.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,14 @@ jobs:
labs: false
skip: false

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

# Test: Oracle GVM 17
- label: Oracle GraalVM 17
target: sample
Expand All @@ -354,6 +362,14 @@ jobs:
labs: false
skip: false

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

steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel.lock

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

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Use [GraalVM](https://graalvm.org) with [Bazel](https://bazel.build) to:
**Via `WORKSPACE.bazel`:**

| Artifact | SHA256 |
| ------- | ----------- |
| Artifact | SHA256 |
| -------------------------- | ------------------------------------------------------------------ |
| `rules_graalvm-0.11.1.zip` | `e4fa275b062dcd03b1ecb02bb25f01ead512023006a874a5e0c2cb78ba6d8e73` |
| `rules_graalvm-0.11.1.tgz` | `0128b4a8664974689fadae56b517de627c5f42141925111baf05dc91c37af1c0` |

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 = "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 = "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
)
```

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

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

| Artifact | Integrity value |
| ------- | --------------- |
| Artifact | Integrity value |
| -------------------------- | ----------------------------------------------------- |
| `rules_graalvm-0.11.1.zip` | `sha256-5PonWwYtzQOx7LArsl8B6tUSAjAGqHSl4MLLeLptjnM=` |
| `rules_graalvm-0.11.1.tgz` | `sha256-ASi0qGZJdGifra5WtRfeYnxfQhQZJREbrwXckcN68cA=` |

Expand All @@ -100,9 +100,9 @@ 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 = "22.0.0", # gvm sdk version format like `24.x.x` also supported
distribution = "ce", # `oracle`, `ce`, or `community`
java_version = "21", # `17`, `20`, or `21`, as supported by the version provided
java_version = "22", # `17`, `20`, `21`, or `22` as supported by the version provided
)
use_repo(gvm, "graalvm")
register_toolchains("@graalvm//:jvm")
Expand Down Expand Up @@ -141,7 +141,7 @@ register_toolchains("@graalvm//:sdk")

```
build --extra_toolchains=@graalvm//:toolchain
build --java_runtime_version=graalvm_20
build --java_runtime_version=graalvm_22
```

> **Note**
Expand Down
1 change: 1 addition & 0 deletions example/integration_tests/graalvm-ce-22/.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-22/.bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.0.0
1 change: 1 addition & 0 deletions example/integration_tests/graalvm-ce-22/.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-22/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 9b7c67b

Please sign in to comment.