Planning for flatpak 1.10

Bastien Nocera hadess at hadess.net
Mon Aug 24 11:23:04 UTC 2020


On Mon, 2020-08-24 at 13:08 +0200, Alexander Larsson wrote:
> On Mon, 2020-08-24 at 12:27 +0200, Bastien Nocera wrote:
> > On Mon, 2020-08-24 at 11:47 +0200, Alexander Larsson wrote:
> > > I also want need to make a pass over the terminal output/redraw
> > > handling in flatpak, as it needs some polish.
> > 
> > I think we will also need to look at making sure that we handle
> > default
> > git branches that aren't called "master" (I believe in flatpak, and
> > flatpak-builder) and consider whether we want to also move the
> > default
> > ostree repo default branch name.
> 
> I don't think flatpak does any git call-out, those are all in
> flatpak-
> builder i believe. However, fixing that is kinda tricky. If you
> specify
> nothing it always expands it to master in the code, rather than "pass
> nothing for branch, and then see what you get". So while you can
> change
> the branch and handle non-master branches, its a bit more work to
> handle non-master default in a good way. Also, the git code is less
> than obvious as it does local mirroring and shallow pulls.

You don't have to "pass nothing for branch and see what you get" to get
the default branch, you can use something like this to do it:
https://gitlab.gnome.org/GNOME/jhbuild/-/commit/77192689d33d54a43289130c5d7edf85e89f9f3d

Though it's certainly more complicated if you can't rely on the tree
being checked out to run that command.

It will be a necessary change as GitHub, GitLab and GNOME all are going
to change the name of the default branch for new projects. See:
https://discourse.gnome.org/t/rfc-default-to-main-branch-name-for-new-repos-in-gitlab-gnome-org/3948

> For ostree branches, we do default to "master" in some cases. I guess
> it might be interesting to see what we can do about that. However,
> for
> flathub we don't actually use master, but rather "stable" and "beta".

280 "master" references in the flatpak tree alone.

I don't know whether "stable" or "beta" really reflect what that branch
name is supposed to be, and there could be some benefits to not using
either "master" or "main" which just ends up confusing developers that
never quite get whether we're talking of an ostree branch or a git one.

Cheers



More information about the Flatpak mailing list