diff options
author | Christopher Davis <christopherdavis@gnome.org> | 2022-02-08 09:41:19 -0800 |
---|---|---|
committer | Ondrej Holy <oholy@redhat.com> | 2022-02-11 14:59:49 +0100 |
commit | 3e3bec7373fb93febcf3a471475cd848f5df5cd0 (patch) | |
tree | a8fa9301e0c63b42e1700fecb4329b1fafc8d5ac | |
parent | a446919a4c29d0f711157f25886d3b6cc1e48c17 (diff) | |
download | nautilus-3e3bec7373fb93febcf3a471475cd848f5df5cd0.tar.gz |
flatpak: Use `main` branch for libportal
libportal changed the name of their primary branch to
`main`. `flatpak` can't automatically handle `main`,
so we need to specify it manually.
Should fix the recent CI failures.
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 3 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index fb6213074..adcf8aebf 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -125,7 +125,8 @@ "sources" : [ { "type": "git", - "url": "https://github.com/flatpak/libportal.git" + "url": "https://github.com/flatpak/libportal.git", + "branch": "main" } ] }, diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 555f95905..98cf2c5e3 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -92,6 +92,7 @@ modules: sources: - type: git url: https://github.com/flatpak/libportal.git + branch: main - buildsystem: meson builddir: true name: nautilus |