summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-08-07 01:38:46 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2021-08-07 01:38:46 +0200
commit3e53b8cc09f63b1533f505b398ec7dfe4e8b3a43 (patch)
treed1dc2a73cb867dd645bca9ec8759d191cf7f9753
parentShare shm in flatpak (diff)
downloadnheko-3e53b8cc09f63b1533f505b398ec7dfe4e8b3a43.tar.xz
Install recent flatpak in CI
-rw-r--r--.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e24c5c85..cea6be7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,7 +91,9 @@ build-flatpak-amd64:
   #image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
   tags: [docker]
   before_script:
-    - apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
+    # need flatpak 1.11.1 at least
+    - apt-get update && apt-get install -y software-properties-common
+    - add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
     - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     - flatpak --noninteractive install --user flathub org.kde.Platform//5.15
     - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15
@@ -119,7 +121,9 @@ build-flatpak-arm64:
   #image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
   tags: [docker-arm64]
   before_script:
-    - apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
+    # need flatpak 1.11.1 at least
+    - apt-get update && apt-get install -y software-properties-common
+    - add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
     - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
     - flatpak --noninteractive install --user flathub org.kde.Platform//5.15
     - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15