Skip to content

Commit

Permalink
ci: fix ci workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
nmammeri committed Jun 10, 2024
1 parent 436c5be commit 7f24ade
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/release_pyton_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
with:
java-version: '22'
distribution: 'graalvm-community'
set-java-home: 'true'
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
Expand Down Expand Up @@ -101,6 +102,7 @@ jobs:
with:
java-version: '22'
distribution: 'graalvm-community'
set-java-home: 'true'
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
Expand Down Expand Up @@ -140,6 +142,7 @@ jobs:
with:
java-version: '22'
distribution: 'liberica'
set-java-home: 'true'
- name: Build wheels
uses: PyO3/maturin-action@v1
with:
Expand Down
6 changes: 5 additions & 1 deletion extract-core/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ pub fn check_graalvm(target_os: &str) {
"macos" => "24.0.1.r22-nik",
_ => "22.0.1-graalce"
};
let native_image_exe = match target_os {
"windows" => "native-image.cmd",
_ => "native-image"
};
let help_msg = format!("\nWe recommend using sdkman to install and \
manage different JDKs. See https://sdkman.io/usage for more information.\n\
You can install graalvm using:\n \
Expand All @@ -76,7 +80,7 @@ pub fn check_graalvm(target_os: &str) {
match java_home {
Some(java_home) => {
// Check that native-image is in JAVA_HOME/bin
let native_image = java_home.join("bin").join("native-image");
let native_image = java_home.join("bin").join(native_image_exe);
if !native_image.exists() {
panic!("Your JAVA_HOME env variable is pointing to: {}. Please make sure your \
JAVA_HOME is pointing to a valid GraalVM JDK. {}", java_home.display(), help_msg);
Expand Down

0 comments on commit 7f24ade

Please sign in to comment.