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

Bump PACKAGE_VERSION_PATCH for next patch release #7284

Merged
merged 1 commit into from Jul 31, 2022

Conversation

adrianinsaval
Copy link
Member

This gets used here

<release version="@PACKAGE_VERSION@" date="@APPDATA_RELEASE_DATE@"/>
and is the version picked up by flatpak so it should be updated too. Personally I don't understand why we have a PACKAGE_VERSION_PATCH and FREECAD_VERSION_PATCH as separate variables but I keep that way for now.

@berndhahnebach
Copy link
Contributor

pipeline status for feature branch PR_7284. Pipeline 600984407 was triggered at 0b99c07. All CI branches and pipelines.

@donovaly
Copy link
Member

Why for master? I think this should only go to the 0-20 branch, right?

@adrianinsaval
Copy link
Member Author

Notice the PR is for FreeCAD-0-20 branch, not master

@donovaly
Copy link
Member

Notice the PR is for FreeCAD-0-20 branch, not master

GitHub tells me it would be merged to the "base branch". I cannot see the 0-20, therefore I was asking.

@donovaly donovaly merged commit 014ed4c into FreeCAD:releases/FreeCAD-0-20 Jul 31, 2022
@adrianinsaval adrianinsaval deleted the patch-2 branch July 31, 2022 03:44
@adrianinsaval
Copy link
Member Author

Weird, on mobile it's shown here and I think on desktop too
Screenshot_2022-07-30-23-44-16-709_com brave browser_1

@donovaly
Copy link
Member

Yes, after the merge. But I wanted to see it before I merge where it goes.

@adrianinsaval
Copy link
Member Author

For me it also showed before merge, this is bellow the title of the PR. I can see in other PRs that it says something like X wants to merge # commits into FreeCAD:branch from X:xbranch so it's not something just shown to the person submitting.

Thanks for merging, I'll probably make a PR to master to unify those two so we don't have to change the number in two places for no reason, it's too prone to error.

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.

None yet

3 participants