#9631 flatpaks: move from 'master' to 'stable'
Closed: Fixed 3 years ago by kevin. Opened 3 years ago by otaylor.

We'd like to switch from using 'master' for the default stream of Flatpak applications to 'stable'. Reasons:
* avoid having the problematical 'master' word in versions
* be consistent with the Flatpak branch name as seen in 'flatpak info' - which is stable (same as for apps on Flathub)

(The Flatpak branch can't be easily changed while preserving the ability for people to upgrade existing installed Flatpaks, so this favors using 'stable' over the modularity recommendation of 'rolling')

Steps here:
* mass branch all projects under flatpaks/* creating a stable branch from the master branch
* Remove the the existing master branch content, add a pointer to the stable branch in README.md
* Change the default branch in pagure for all these projects to 'stable'

I should be able to do the second step with provenpackager permissions, but need releng help for the first and third.

Cc: @kalev


Metadata Update from @mohanboddu:
- Issue tagged with: groomed, high-gain, high-trouble

3 years ago

I seem to recall there be some discussion around doing this for the entire dist-git, which makes me wonder if we should wait on this and to it all at once or start with flatpaks now and use this namespace as a test bed.

Thoughts?

I seem to recall there be some discussion around doing this for the entire dist-git, which makes me wonder if we should wait on this and to it all at once or start with flatpaks now and use this namespace as a test bed.
Thoughts?

I would always be in favour of a single testbed rather than big bang approach just in case there are any unforeseen issues

There's definitely been discussion of master => rawhide for dist-git in general, but rawhide really doesn't work at all for the branch name for the rolling-stable approach we take for Flatpaks.

(E.g., at the moment we are building a F32 Inkscape against an F32 runtime on the master branch.)

So, I think this is going to be separate anyways - but could definitely be a testbed for a bigger branch rename.

I seem to recall there be some discussion around doing this for the entire dist-git, which makes me wonder if we should wait on this and to it all at once or start with flatpaks now and use this namespace as a test bed.
Thoughts?

I like using flatpaks as a test bed but I prefer using the same branch name for all the namespaces in dist-git rather than having each namespace their own default branch.

Metadata Update from @mohanboddu:
- Issue untagged with: groomed, high-gain, high-trouble

3 years ago

Metadata Update from @mohanboddu:
- Issue tagged with: groomed, high-gain, high-trouble, meeting

3 years ago

So, we are doing other src.fedoraproject.org repos tomorrow with rawhide/main as the new name.

I wonder if we couldn't just add 'stable' as another symref for flatpaks? or replace rawhide with 'stable' for them?

@pingou / @mohanboddu thoughts?

Is there some description of the behavior you are getting with symrefs? If I try adding a symbolic ref to a local repository and cloning that repository, I don't see the symbolic ref at all.

In general, I think it's important:
* That there's only one branch visible in pagure
* That 'git clone <repo>' lands you on branch called stable

We need 'fedpkg module-build' to reliably end up with a stream called stable with no possibility of mistake.

I basically think that anything other than a single default branch called stable is unnecessarily confusing, but could be convinced :-)

So, a symref just shows exactly the same as any branch, but the symref stays exactly the same as the branch it's associated with.
pagure has a setting for 'default branch', which is that you get if you clone and don't specify any branch.
Thats also what it shows by default in the web interface, etc.

https://src.fedoraproject.org/rpms/python-mechanize has been converted in prod. It has: no master branch, a rawhide branch (which is default) and a 'main' branch symref.

If you check out nothing, you get rawhide, if you specify rawhide you get rawhide, if you specify main you get main (but it's really rawhide).

a 'fedpkg module-build' in any of those checkouts would build the same thing.

Well, the only objection I have to just changing all flatpak's to use stable instead of master is that they would be different than all the rest of the repos.
But perhaps thats not a great big deal. @pingou and @mohanboddu have been doing all the work here, so I will let them chime in.

I'm pretty sure that without rpkg changes, building on rawhide will produce
a module build with the stream "rawhide" and building on main a module with
the stream "main", different versioning though the module contents would be
identical.

The stable branch of flatpaks does not follow the Fedora rahwide content
and doesn't have rawhide-like stability priorities. It's not rawhide.

So if we need to be the same as everything else, we'd need to move the
current "master" to stable and have a new rawhide/master branch with a "do
not use this" README.md.

I'd, however, prefer to just move master to stable.

We moved all the flatpak's to 'stable'

Metadata Update from @kevin:
- Issue close_status updated to: Fixed
- Issue status updated to: Closed (was: Open)

3 years ago

Login to comment on this ticket.

Metadata