Staging for version increment automation #684

prudhvigodithi · 2022-07-11T20:19:59Z

Description

This is the staging PR for to execute workflows that auto raise the version increment PR's
Example: prudhvigodithi#1

Issues Resolved

Part of: opensearch-project/opensearch-build#1375
From solution: opensearch-project/opensearch-build#1375 (comment)
Related issue: #674

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

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.

Signed-off-by: pgodithi <pgodithi@amazon.com>

prudhvigodithi · 2022-07-11T20:20:31Z

Referred old version increment PR:
#637

joshuali925

a few comments, thanks

joshuali925 · 2022-07-11T20:25:22Z

build.gradle

+                include(name: "build.gradle")
+            }
+        }
+        ant.replaceregexp(file:'sql-jdbc/build.gradle', match:"version '\\d+.\\d+.\\d+.\\d+'", replace:"version " + "'" + newVersion.tokenize('-')[0] + '.0' + "'", flags:'g', byline:true)


could you remove this line? sql-jdbc was accidentally bumped in previous PR, but it's a driver and the version should be independent

So @joshuali925 there is no version increment in this file sql-jdbc/build.gradle'?

Pushed in my latest commit @joshuali925

thanks. the latest sql-jdbc release is 1.1.0.1, the next one should be 1.2.0.0 or 2.0.0.0 depending on the changes, but should not be the same version as core and plugins

joshuali925 · 2022-07-11T20:26:56Z

build.gradle

+            fileset(dir: projectDir) {
+                // Include the required files that needs to be updated with new Version
+                include(name: ".github/workflows/sql-workbench-test-and-build-workflow.yml")
+                include(name: "doctest/build.gradle")


could you also remove this? we don't have version defined in doctest/build.gradle

Pushed in my latest commit @joshuali925

Signed-off-by: pgodithi <pgodithi@amazon.com>

codecov-commenter · 2022-07-11T20:39:02Z

Codecov Report

Merging #684 (13c0ad2) into main (e180d56) will increase coverage by 0.04%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #684      +/-   ##
============================================
+ Coverage     94.70%   94.74%   +0.04%     
- Complexity     2825     2857      +32     
============================================
  Files           282      283       +1     
  Lines          7609     7676      +67     
  Branches        558      561       +3     
============================================
+ Hits           7206     7273      +67     
  Misses          349      349              
  Partials         54       54

Flag	Coverage Δ
query-workbench	`62.76% <ø> (ø)`
sql-engine	`97.74% <ø> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
...c/main/java/org/opensearch/sql/expression/DSL.java	`100.00% <0.00%> (ø)`
...h/sql/expression/function/BuiltinFunctionName.java	`100.00% <0.00%> (ø)`
...h/sql/expression/function/OpenSearchFunctions.java	`100.00% <0.00%> (ø)`
...arch/storage/script/filter/FilterQueryBuilder.java	`100.00% <0.00%> (ø)`
...ript/filter/lucene/relevance/QueryStringQuery.java	`100.00% <0.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e180d56...13c0ad2. Read the comment docs.

joshuali925

thanks

joshuali925 · 2022-07-11T20:42:59Z

build.gradle

+            fileset(dir: projectDir) {
+                // Include the required files that needs to be updated with new Version
+                include(name: ".github/workflows/sql-workbench-test-and-build-workflow.yml")
+                include(name: "build.gradle")


one more question, is matching opensearch_version.tokenize('-')[0] enough on build.gradle? e.g. should patterns be more strict to avoid accidentally matching other dependency versions or this is enough?

Thanks, I can add more restrictive parsing, will push in my latest commit.

Can you please check now @joshuali925
Sample PR with new change: prudhvigodithi#2
Does this sample PR for version increment looks good?

approved, last question: i see it's hard coded to use snapshot in build.gradle + '-SNAPSHOT"', will there be a case we use x.x.x instead of x.x.x-SNAPSHOT?

So until now we all build with -SNAPSHOT except during main release.
@bbarani @peterzhuamazon

Signed-off-by: pgodithi <pgodithi@amazon.com>

joshuali925

lgtm, thanks

Signed-off-by: pgodithi <pgodithi@amazon.com>

prudhvigodithi · 2022-07-12T22:54:42Z

Renaming to task updateVersion following opensearch-project/opensearch-plugin-template-java#32.

penghuo

LGTM

* Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> (cherry picked from commit 69ab0d3)

* Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> (cherry picked from commit 69ab0d3) Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

* Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> (cherry picked from commit 69ab0d3) Signed-off-by: prudhvigodithi <pgodithi@amazon.com> Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>

prudhvigodithi added 2 commits July 11, 2022 16:10

Version increment automation

ec10d94

Signed-off-by: pgodithi <pgodithi@amazon.com>

Version increment automation

c9f5da3

Signed-off-by: pgodithi <pgodithi@amazon.com>

prudhvigodithi requested a review from a team as a code owner July 11, 2022 20:19

prudhvigodithi mentioned this pull request Jul 11, 2022

OpenSearch: Automate increment to next development iteration opensearch-project/opensearch-build#1375

Closed

29 tasks

joshuali925 reviewed Jul 11, 2022

View reviewed changes

Version increment automation

86af7c7

Signed-off-by: pgodithi <pgodithi@amazon.com>

joshuali925 previously approved these changes Jul 11, 2022

View reviewed changes

Version increment automation

7ec9819

Signed-off-by: pgodithi <pgodithi@amazon.com>

prudhvigodithi dismissed joshuali925’s stale review via 7ec9819 July 11, 2022 20:49

joshuali925 previously approved these changes Jul 11, 2022

View reviewed changes

prudhvigodithi added the backport 2.1 label Jul 11, 2022

Version increment automation: task rename updateVersion

13c0ad2

Signed-off-by: pgodithi <pgodithi@amazon.com>

prudhvigodithi dismissed joshuali925’s stale review via 13c0ad2 July 12, 2022 22:46

joshuali925 approved these changes Jul 21, 2022

View reviewed changes

penghuo approved these changes Jul 21, 2022

View reviewed changes

penghuo merged commit 69ab0d3 into opensearch-project:main Jul 21, 2022

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 21, 2022

Staging for version increment automation (#684)

54cffc0

* Version increment automation Signed-off-by: pgodithi <pgodithi@amazon.com> (cherry picked from commit 69ab0d3)

opensearch-trigger-bot bot mentioned this pull request Jul 21, 2022

[Backport 2.1] Staging for version increment automation #706

Merged

prudhvigodithi mentioned this pull request Aug 16, 2022

Staging for version increment automation #674

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staging for version increment automation #684

Staging for version increment automation #684

prudhvigodithi commented Jul 11, 2022 •

edited

prudhvigodithi commented Jul 11, 2022

joshuali925 left a comment

joshuali925 Jul 11, 2022

prudhvigodithi Jul 11, 2022

prudhvigodithi Jul 11, 2022

joshuali925 Jul 11, 2022

joshuali925 Jul 11, 2022

prudhvigodithi Jul 11, 2022

codecov-commenter commented Jul 11, 2022 •

edited

joshuali925 left a comment

joshuali925 Jul 11, 2022

prudhvigodithi Jul 11, 2022

prudhvigodithi Jul 11, 2022

joshuali925 Jul 11, 2022

prudhvigodithi Jul 11, 2022

joshuali925 left a comment

prudhvigodithi commented Jul 12, 2022

penghuo left a comment

Staging for version increment automation #684

Staging for version increment automation #684

Conversation

prudhvigodithi commented Jul 11, 2022 • edited

Description

Issues Resolved

Check List

prudhvigodithi commented Jul 11, 2022

joshuali925 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-commenter commented Jul 11, 2022 • edited

Codecov Report

joshuali925 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joshuali925 left a comment

Choose a reason for hiding this comment

prudhvigodithi commented Jul 12, 2022

penghuo left a comment

Choose a reason for hiding this comment

prudhvigodithi commented Jul 11, 2022 •

edited

codecov-commenter commented Jul 11, 2022 •

edited