summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
commitbb80d3feebdc9acc52e3f4ad24084d8425f043a2 (patch)
tree2084a84c39f159c6aea254775dc0880d52579d45 /.gitlab-ci.yml
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml29
1 files changed, 18 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6aa308..6ee2899 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,24 @@
include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
-variables:
+.vars-devel:
+ variables:
BUNDLE: "org.gnome.Shotwell.Devel.flatpak"
GIT_SUBMODULE_STRATEGY: recursive
+ MANIFEST_PATH: "flatpak/org.gnome.Shotwell.json"
+ RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
+ FLATPAK_MODULE: "shotwell"
+ APP_ID: "org.gnome.Shotwell"
-flatpak:
- extends: ['.flatpak']
- image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:41
- variables:
- BRANCH: testing
- MANIFEST_PATH: "flatpak/org.gnome.Shotwell.json"
- RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
- # Replace with your application name, as written in the manifest
- FLATPAK_MODULE: "shotwell"
- APP_ID: "org.gnome.Shotwell"
+flatpak@x86_64:
+ extends: ['.flatpak@x86_64', '.vars-devel']
+flatpak@aarch64:
+ extends: ['.flatpak@aarch64', '.vars-devel']
+
+nightly@x86_64:
+ extends: '.publish_nightly'
+ needs: ['flatpak@x86_64']
+
+nightly@aarch64:
+ extends: '.publish_nightly'
+ needs: ['flatpak@aarch64']