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.

Sign up for GitHub

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

Staging for version increment automation #1932

Merged
merged 8 commits into from
Aug 1, 2022
Merged

Staging for version increment automation #1932

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ea5cce
Version increment automation
prudhvigodithi Jul 10, 2022
343110f
Version increment automation
prudhvigodithi Jul 10, 2022
61f46c3
Version increment automation
prudhvigodithi Jul 10, 2022
4846359
Version increment automation: added ci tests
prudhvigodithi Jul 12, 2022
fce900c
Version increment automation: task rename updateVersion
prudhvigodithi Jul 12, 2022
5cdfaff
gradle updateVersion add CI tests
prudhvigodithi Jul 26, 2022
a4f16fb
gradle updateVersion add CI tests
prudhvigodithi Jul 26, 2022
8c9a499
gradle updateVersion add CI tests
prudhvigodithi Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ jobs:

- run: ./gradlew clean assemble -Dbuild.version_qualifier=${{ env.TEST_QUALIFIER }} && test -s ./build/distributions/opensearch-security-${{ env.SECURITY_PLUGIN_VERSION_ONLY_NUMBER }}-${{ env.TEST_QUALIFIER }}-SNAPSHOT.zip

- run: ./gradlew clean versionIncrement -DnewVersion=3.0.0-SNAPSHOT
Copy link
Member

Choose a reason for hiding this comment

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

This executes the command, but doesn't verify any outcome.

What do you think about adding a execution of the gradle task assemble, check the artifact is version X, then run the versionIncrement task, then assemble and check its version X+1


- name: List files in the build directory if there was an error
run: ls -al ./build/distributions/
if: failure()
17 changes: 17 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,3 +486,20 @@ afterEvaluate {
tasks = ['build', 'buildRpm', 'buildDeb']
}
}

// versionIncrement: Task to auto increment to the next development iteration
task versionIncrement {
Copy link
Member

Choose a reason for hiding this comment

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

Please add a test for this, see example tests in https://github.com/opensearch-project/security/blob/main/.github/workflows/ci.yml#L124

Copy link
Member Author

Choose a reason for hiding this comment

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

Added @peternied can you please check.
Thank you

onlyIf { System.getProperty('newVersion') }
doLast {
ext.newVersion = System.getProperty('newVersion')
println "Setting version to ${newVersion}."
// String tokenization to support -SNAPSHOT
ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) {
fileset(dir: projectDir) {
// Include the required files that needs to be updated with new Version
include(name: "bwc-test/build.gradle")
}
}
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
}
}