[gnome-software/wjt/flatpak-manifest-main] flatpak: Specify 'main' branch for gnome-software
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wjt/flatpak-manifest-main] flatpak: Specify 'main' branch for gnome-software
- Date: Sat, 31 Jul 2021 07:27:43 +0000 (UTC)
commit c85f24b071fcf793eb94248723d2ad5ae238348c
Author: Will Thompson <will willthompson co uk>
Date: Sat Jul 31 08:24:25 2021 +0100
flatpak: Specify 'main' branch for gnome-software
flatpak-builder defaults to 'master' if the branch is not specified.
Since gnome-software's mainline branch was renamed to 'main', the
Flatpak build now fails:
$ flatpak-builder --disable-updates --install --user --force-clean _app
contrib/org.gnome.SoftwareDevel.json
Emptying app dir '_app'
Downloading sources
Fetching full git repo https://gitlab.gnome.org/GNOME/gnome-software.git
fatal: ambiguous argument 'master': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
Failed to download sources: module gnome-software: Child process exited with code 128
CI continues to work because that build stops at the last module, and
then builds it from the local source tree.
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 941f00f10..8f4916f99 100644
--- a/contrib/org.gnome.SoftwareDevel.json
+++ b/contrib/org.gnome.SoftwareDevel.json
@@ -194,7 +194,8 @@
"sources": [
{
"type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gnome-software.git"
+ "url": "https://gitlab.gnome.org/GNOME/gnome-software.git",
+ "branch": "main"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]