[gnome-software/wjt/flatpak-ostree-main-branch] flatpak: Update OSTree branch name
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wjt/flatpak-ostree-main-branch] flatpak: Update OSTree branch name
- Date: Tue, 18 May 2021 10:38:52 +0000 (UTC)
commit 85a6e3c2f701e890fa9e8c163bb73f7660b1c0dc
Author: Will Thompson <wjt endlessos org>
Date: Tue May 18 11:34:59 2021 +0100
flatpak: Update OSTree branch name
OSTree has renamed its development branch from 'master' to 'main'. They
have kept the 'master' branch around for the benefit of tools that
require pinned commits to be on the 'master' branch, but removed all
content from that branch.
As a result of this change, this Flatpak build fails, at least on my
system which had an existing checkout of the 'master' branch. I suspect
that on a new checkout, flatpak-builder would respect the server's
default branch, but being explicit here does not cause harm.
Explicitly specify the 'branch' as 'main' for the ostree module.
https://github.com/ostreedev/ostree/pull/2358
https://github.com/ostreedev/ostree/issues/2360
contrib/org.gnome.SoftwareDevel.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/contrib/org.gnome.SoftwareDevel.json b/contrib/org.gnome.SoftwareDevel.json
index e646eae7f..56f0f1fc8 100644
--- a/contrib/org.gnome.SoftwareDevel.json
+++ b/contrib/org.gnome.SoftwareDevel.json
@@ -156,7 +156,8 @@
"sources": [
{
"type": "git",
- "url": "https://github.com/ostreedev/ostree.git"
+ "url": "https://github.com/ostreedev/ostree.git",
+ "branch": "main"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]