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

Adding maven.development.version and build.release.type variables to Bamboo #4818

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

wikumChamith
Copy link
Member

Description of what I changed

Issue I worked on

see https://issues.openmrs.org/browse/TRUNK-

Checklist: I completed these to help reviewers :)

  • My IDE is configured to follow the code style of this project.

    No? Unsure? -> configure your IDE, format the code and add the changes with git add . && git commit --amend

  • I have added tests to cover my changes. (If you refactored
    existing code that was well tested you do not have to add tests)

    No? -> write tests and add them to this commit git add . && git commit --amend

  • I ran mvn clean package right before creating this pull request and
    added all formatting changes to my commit.

    No? -> execute above command

  • All new and existing tests passed.

    No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.

  • My pull request is based on the latest changes of the master branch.

    No? Unsure? -> execute command git pull --rebase upstream master

@dkayiwa
Copy link
Member

dkayiwa commented Nov 6, 2024

@wikumChamith can we remove the formatting changes?

@wikumChamith
Copy link
Member Author

@dkayiwa I had to make those formatting changes to fix the errors we got before.

@dkayiwa
Copy link
Member

dkayiwa commented Nov 6, 2024

Does that mean the existing one is not correctly formatted?

@wikumChamith
Copy link
Member Author

wikumChamith commented Nov 6, 2024

Yes. That error we got was not from the code I added.

@dkayiwa
Copy link
Member

dkayiwa commented Nov 6, 2024

Do you mind explaining a bit more why the error happened only after those changed were merged?

@wikumChamith
Copy link
Member Author

Do you mind explaining a bit more why the error happened only after those changed were merged?

We are still getting that error. Here is the failure for the revert you did: https://ci.openmrs.org/browse/TRUNK-MASTER-3603/commit

@dkayiwa
Copy link
Member

dkayiwa commented Nov 6, 2024

I am still trying to understand why it was not failing before our attempt. 😊

@wikumChamith
Copy link
Member Author

Is it possible it did but somehow got overlooked?

@wikumChamith
Copy link
Member Author

@dkayiwa, we've encountered this error before as well. For instance, here’s the same issue in @ibacher's changes on this file: https://ci.openmrs.org/browse/TRUNK-MASTER-3482

@dkayiwa
Copy link
Member

dkayiwa commented Nov 7, 2024

Does the fix require all these formatting changes?

@wikumChamith
Copy link
Member Author

Does the fix require all these formatting changes?

Yes

@dkayiwa
Copy link
Member

dkayiwa commented Nov 7, 2024

How do you tell so?

@wikumChamith
Copy link
Member Author

How do you tell so?

I used a YML validator to check.

@dkayiwa dkayiwa merged commit 5f89ffc into openmrs:master Nov 7, 2024
6 checks passed
@dkayiwa
Copy link
Member

dkayiwa commented Nov 7, 2024

Ok let us see how this goes.

@wikumChamith
Copy link
Member Author

@ibacher
Copy link
Member

ibacher commented Nov 7, 2024

What's the point of adding the maven.development.version variable? We don't seem to actually be using it since we always set the development version using this: ${DEV_IMAGE} mvn versions:set -DnextSnapshot=true -DgenerateBackupPoms=false and we don't re-export that back to Bamboo.

Traditionally, maven.development.version gets passed as the second argument to this script, and the use-case is to be able to specify the next SNAPSHOT version (which is not really something we do too much).

@wikumChamith
Copy link
Member Author

wikumChamith commented Nov 8, 2024

@ibacher, is it possible to handle cases like the following when doing a release without using the maven.development.version variable?

  • When releasing Platform 2.7.0-alpha, we want the next development version to remain Platform 2.7.0-SNAPSHOT.
  • After the full release of Platform 2.7.0, we want the next development version to be Platform 2.7.1-SNAPSHOT.

cc: @rkorytkowski

@rkorytkowski
Copy link
Member

@wikumChamith you can run mvn versions:set -DnewVersion=2.7.0-SNAPSHOT locally after running the release and issue a pull request or commit directly to the repo.

@dkayiwa
Copy link
Member

dkayiwa commented Nov 8, 2024

@rkorytkowski would that be better than just setting the next development version variable in bamboo and have all that automatically done during the release task?

@ibacher
Copy link
Member

ibacher commented Nov 10, 2024

is it possible to handle cases like the following when doing a release without using the maven.development.version variable?

Yes. There’s a job in the RefApp for O3 that does something very similar. But my real point was that maven.development.version is an OpenMRS convention, not a Bamboo or Maven thing. So just adding the variable to the CI job doesn’t actually do what you want. You need to swap out the line that sets the next development version with the value of the variable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants