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

Version 1.2.0 #4255

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Version 1.2.0 #4255

merged 1 commit into from
Oct 30, 2024

Conversation

fingolfin
Copy link
Member

@fingolfin fingolfin commented Oct 30, 2024

Resolves #4211

Project.toml Outdated Show resolved Hide resolved
@lgoettgens
Copy link
Member

I think you messed up 1.2.0 with 0.12.0.

And just as stupid question since I don't remember how we did it the last few times: When do we branch off release-1.2? Before or after adapting the version?

@benlorenz
Copy link
Member

And just as stupid question since I don't remember how we did it the last few times: When do we branch off release-1.2? Before or after adapting the version?

I usually created the release branch first and then merged the PR setting the version to the release version. But I guess bumping it first and then branching from the merge is also fine.
Once the branch is done the master should get 1.3.0-DEV.

I wrote down my process here: https://docs.oscar-system.org/stable/DeveloperDocumentation/release/

@fingolfin fingolfin changed the title Version 0.12.0 Version 1.20 Oct 30, 2024
@fingolfin
Copy link
Member Author

Yeah my plan is that as soon as as this is merged, we merge another PR setting the version to 1.3.0-DEV.

Or I could just put that commit in here right now and we "merge by rebase" (instead of squash or actual merge) to preserve both commits.

@fingolfin fingolfin changed the title Version 1.20 Version 1.2.0 Oct 30, 2024
@thofma
Copy link
Collaborator

thofma commented Oct 30, 2024

Thanks. I was not sure about the process with the branches (which is why I did not open the PR myself).

Copy link

codecov bot commented Oct 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.60%. Comparing base (84ad208) to head (cd4f52f).
Report is 3 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4255   +/-   ##
=======================================
  Coverage   84.59%   84.60%           
=======================================
  Files         640      640           
  Lines       85126    85128    +2     
=======================================
+ Hits        72015    72019    +4     
+ Misses      13111    13109    -2     

see 1 file with indirect coverage changes

@fingolfin fingolfin enabled auto-merge (squash) October 30, 2024 13:51
@fingolfin fingolfin merged commit cfb03fd into master Oct 30, 2024
30 checks passed
@fingolfin fingolfin deleted the mh/0.12.0 branch October 30, 2024 13:52
@fingolfin
Copy link
Member Author

@benlorenz I assume you will create the branch, ok?

@benlorenz
Copy link
Member

benlorenz commented Oct 30, 2024

@benlorenz I assume you will create the branch, ok?

done: https://github.com/oscar-system/Oscar.jl/commits/release-1.2/
Edit: I also added branch protection rules.

@lgoettgens
Copy link
Member

@benlorenz can you do the 1.3.0-DEV bump as well an commit it as the next thing on master?

@benlorenz
Copy link
Member

@benlorenz can you do the 1.3.0-DEV bump as well an commit it as the next thing on master?

#4258

@benlorenz
Copy link
Member

I regenerated the release notes for 1.2.0 with github since tagbot only showed the changes since the when 1.1.2 was created.

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.

Make a new OSCAR release?
4 participants