Skip to content

Commit 855e907

Browse files
committed
flatpak: ci: use .deb flatpak-builder with workaround
When using the flatpak-builder from flatpak, the CI gives error > dconf-CRITICAL **: 17:56:26.207: unable to create file > '/run/user/1001/dconf/user': Permission denied. dconf will not work > properly. > [...] > FB: Running 'flatpak info --arch=x86_64 --show-commit > org.gnome.Sdk 3.36' on host > Failed to init: Unable to find sdk org.gnome.Sdk version 3.36 Use flatpak-builder from .deb package, but with file: submodule workaround. Change-Id: Icc89cedb4012effd8b69f239382a85fc9ee9517f
1 parent 9b911ea commit 855e907

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/flatpak.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ jobs:
112112
sudo flatpak install --noninteractive flathub \
113113
org.gnome.Platform//3.36 \
114114
org.gnome.Sdk//3.36
115-
# Use flatpak-builder from flathub; see README.md.
116-
sudo flatpak install --noninteractive flathub org.flatpak.Builder
115+
# Work around submodule file: problem until .deb package includes
116+
# the fix for https://github.com/flatpak/flatpak-builder/issues/495 .
117+
git config --global protocol.file.allow always
117118
- name: Build flatpak package
118119
run: |
119120
set -xueo pipefail
@@ -122,7 +123,7 @@ jobs:
122123
perl -pi -e \
123124
"s/(\s*).*FW-Auto-Head.*/\$1commit: $(git rev-parse HEAD) # FW-Auto-Head: Generated line. See build script./" \
124125
org.sil.FieldWorks.yml
125-
flatpak run org.flatpak.Builder --verbose --user --sandbox --ccache \
126+
flatpak-builder --verbose --user --sandbox --ccache \
126127
--repo=local-repo --keep-build-dirs --force-clean \
127128
build-dir org.sil.FieldWorks.yml
128129
- name: Determine package version

0 commit comments

Comments
 (0)