Skip to content

Commit fb475ef

Browse files
committed
tests: Tweak install tests to use flatpak-repo instead of install
Also drop the stray `--user` argument to flatpak-builder Attempt to fix the ocassional flakiness in CI due to random timeouts [1] [2] by avoiding installing. [1]: https://github.com/flatpak/flatpak-builder/actions/runs/22909321693/job/66476906753#step:7:1585 [2]: https://github.com/flatpak/flatpak-builder/actions/runs/22905637946/job/66463413480#step:7:1583
1 parent 5fff033 commit fb475ef

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/test-builder.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ else
176176
fi
177177

178178
# test install
179-
${FLATPAK_BUILDER} --user --install \
179+
${FLATPAK_BUILDER} --repo=$REPO/repo_test_install \
180180
--force-clean builddir org.flatpak.install_test.json >&2
181-
REFS=$(flatpak list --all --columns=ref 2>/dev/null)
182-
echo "$REFS" | grep -q "org\.flatpak\.install_test"
183-
echo "$REFS" | grep -q "org\.flatpak\.install_test\.Debug"
184-
echo "$REFS" | grep -q "org\.flatpak\.install_test\.Locale"
181+
REFS=$(flatpak repo --branches $REPO/repo_test_install 2>/dev/null)
182+
echo "$REFS" | grep -q "app/org\.flatpak\.install_test/"
183+
echo "$REFS" | grep -q "runtime/org\.flatpak\.install_test\.Debug/"
184+
echo "$REFS" | grep -q "runtime/org\.flatpak\.install_test\.Locale/"
185185

186186
echo "ok install"

0 commit comments

Comments
 (0)