-
Notifications
You must be signed in to change notification settings - Fork 73
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
Fix snapshot assemble and build 1.1.0. #176
Conversation
cdb4cb7
to
39164c3
Compare
Signed-off-by: dblock <[email protected]>
Signed-off-by: dblock <[email protected]>
b9eead5
to
acfc26c
Compare
Signed-off-by: dblock <[email protected]>
acfc26c
to
e4e4423
Compare
@@ -33,7 +33,7 @@ jobs: | |||
with: | |||
repository: 'opensearch-project/OpenSearch' | |||
path: OpenSearch | |||
ref: 'main' | |||
ref: '1.x' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we changing the branch ref for OpenSearch to 1.x
from main
? Wouldn't main
of anomaly-detection
refer to main
of OpenSearch and 1.x
of anomaly-detection
refer to 1.x
of OpenSearch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OpenSearch is already developing a 2.0 on main, and 1.1 on the 1.x branch.
None of the plugins I know have a 2.0 line yet, and are developing 1.1 on main.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I still see the 1.1.0 version in OpenSearch main: https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties#L1. Let me know if I am not looking at the right place.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That should get updated to 2.0 but it will break the world. We've only be backporting 1.x changes into 1.x.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it!
Requires opensearch-project/common-utils#58 and opensearch-project/job-scheduler#49, and cleaned up on top of #175.
Signed-off-by: dblock [email protected]
Description
Fix assembly with
-Dbuild.snapshot=true
. The full syntax required passing the version of job scheduler and common utils, which would cause us to need a custom script for the bundle build. Changed build.gradle to default those to the same build as OpenSearch (e.g. 1.0.0 becomes 1.0.0.0 and 1.0.0-SNAPSHOT becomes 1.0.0.0-SNAPSHOT).So to build a snapshot:
Issues Resolved
Closes #173.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.