Skip to content

Conversation

@danirabbit
Copy link
Member

@danirabbit danirabbit commented Jul 16, 2021

@danirabbit danirabbit added the Release Prepping a stable release label Jul 16, 2021
Copy link
Contributor

@btkostner btkostner left a comment

Choose a reason for hiding this comment

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

Changing this branch to 6.0.0 means every day we would be publishing a new 6 version. We should probably keep this as daily so our cron just builds the daily branch, and we only release a new 6 version when we create a release

@danirabbit
Copy link
Member Author

I think that still makes sense to keep the version number up to date. So if we make a change we'd bump the version number in daily

Otherwise we would publish a runtime to the 6 branch with a version of daily, right?

@btkostner
Copy link
Contributor

Daily GitHub action doesn't have a hard set branch, so it will use the version in the json file. So by changing this, you're making a new branch of 6.0.0, and the daily platform branch will no longer be updated.

If you want, we can change the Daily GitHub action to set the branch to daily, then we can change this version to 6 and it would work.

As far as I know, there is no difference between version and branch. The version is just the branch used.

@danirabbit
Copy link
Member Author

danirabbit commented Jul 20, 2021

Ah yeah okay that's kind of confusing but yeah we should make sure the daily publish action is pushing to daily and the release is pushing to major version branches.

When you run Flatpak list --runtime I can confirm that the Gnome runtimes don't seem to be versioned and use branches only. But it does appear that parts of the freedesktop runtime use both version and branch separately. I think that makes more sense to keep track of minor and patch revisions

For example the version of FreeDesktop platform I have is "20.08.14" and the branch is "20.08"

@btkostner btkostner marked this pull request as ready for review July 20, 2021 00:53
Copy link
Contributor

@btkostner btkostner left a comment

Choose a reason for hiding this comment

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

This hard sets daily to always be the daily branch ✔️
Will publish releases to the 6 branch ✔️
Not 100% sure that the branch: 6.0.0 will have any effect

@danirabbit
Copy link
Member Author

Prior to merging, let's poke @Marukesu to see if they have clarifying thoughts on the version stuff :)

@Marukesu
Copy link
Contributor

This hard sets daily to always be the daily branch
Will publish releases to the 6 branch
Not 100% sure that the branch: 6.0.0 will have any effect

branch can't be overriden by the --default-branch option on command line, we should use default-branch on the manifest too.

About the version column in flatpak list, it use the name and version from the appdata file, the same for the name, since we don't include them, the version remains empty and the name fallback for hardcoded ones.

@btkostner
Copy link
Contributor

I updated the manifest to default-branch and used daily so if someone clones the repo and builds it manually, it overwrites the local daily branch.

@danirabbit
Copy link
Member Author

Okay so it sounds like we need to add AppData here as well. I can take care of that today

@danirabbit danirabbit marked this pull request as draft July 20, 2021 16:30
@danirabbit danirabbit marked this pull request as ready for review July 20, 2021 20:10
@danirabbit danirabbit requested a review from Marukesu July 20, 2021 20:10
Copy link
Contributor

@btkostner btkostner left a comment

Choose a reason for hiding this comment

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

I think this looks good to me

@danirabbit danirabbit merged commit 5006248 into main Jul 20, 2021
@danirabbit danirabbit deleted the release-6.0.0 branch July 20, 2021 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release Prepping a stable release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants