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.

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

CI workflow: fix relative cargo.toml path after gradle upgrade to 8.12 #340

Merged
merged 3 commits into from
Jan 15, 2025

Conversation

DariusIMP
Copy link
Member

No description provided.

@DariusIMP DariusIMP added bug Something isn't working internal Changes not included in the changelog labels Jan 14, 2025
@DariusIMP DariusIMP changed the title CI workflow: specifying the directory for jvmTest CI workflow: fix relative cargo.toml path after gradle upgrade to 8.12 Jan 14, 2025
@@ -208,7 +208,7 @@ fun buildZenohJNI(mode: BuildMode = BuildMode.DEBUG) {
}

val result = project.exec {
commandLine(*(cargoCommand.toTypedArray()), "--manifest-path", "../zenoh-jni/Cargo.toml")
commandLine(*(cargoCommand.toTypedArray()), "--manifest-path", "./zenoh-jni/Cargo.toml")
Copy link
Contributor

Choose a reason for hiding this comment

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

There are a number of other places in the file that uses the relative path ../, shouldn't those be updated as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like CI passes with just the one change in the relative dir. I wonder if it might cause problems during release though

Copy link
Member Author

Choose a reason for hiding this comment

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

I have double checked doing publications to maven local and the native libs are loaded properly. Seems that the Gradle upgrade issue only affects here when running a command this way using commandLine (which is a trick for automatically building the native library before building the packages). These changes should work fine.

@milyin milyin merged commit 434a9af into eclipse-zenoh:main Jan 15, 2025
8 checks passed
@DariusIMP DariusIMP deleted the fix_ci branch January 15, 2025 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working internal Changes not included in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants