From: Jordan Petridis <jordan@centricular.com>
Date: Sat, 17 Jun 2023 01:49:55 +0000 (+0300)
Subject: flatpak: Build the extension for both 22.08 and 23.08 versions
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ad2fe714f6a6f4a9b4fff6f4b59a4294506125e3;p=thirdparty%2Fvala.git

flatpak: Build the extension for both 22.08 and 23.08 versions
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f79c25ec..d82c52a32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,18 +13,45 @@ include: "https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_
     BUNDLE: "vala-extension.flatpak"
     EXPORT_RUNTIME: "--runtime"
     RUN_TESTS: "no"
+
+.vars-22.08:
+  extends: [".vars-extension"]
+  # Use the image from the last stable runtime that includes 22.08 sdk
+  image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-44'
+  variables:
     BRANCH: "22.08"
 
-flatpak-extension@x86_64:
-  extends: [".flatpak@x86_64", ".vars-extension"]
+.vars-23.08beta:
+  extends: [".vars-extension"]
+  variables:
+    BRANCH: "23.08beta"
+  before_script:
+    - sed -i "s/22.08/$BRANCH/g" $MANIFEST_PATH
+
+flatpak-extension@22.08@x86_64:
+  extends: [".flatpak@x86_64", ".vars-22.08"]
+
+flatpak-extension@23.08beta@x86_64:
+  extends: [".flatpak@x86_64", ".vars-23.08beta"]
+
+flatpak-extension@22.08@aarch64:
+  extends: [".flatpak@aarch64", ".vars-22.08"]
+
+flatpak-extension@23.08beta@aarch64:
+  extends: [".flatpak@aarch64", ".vars-23.08beta"]
+
+nightly@22.08@x86_64:
+  extends: [".publish_nightly", ".flatpak rules"]
+  needs: ["flatpak-extension@22.08@x86_64"]
 
-flatpak-extension@aarch64:
-  extends: [".flatpak@aarch64", ".vars-extension"]
+nightly@23.08beta@x86_64:
+  extends: [".publish_nightly", ".flatpak rules"]
+  needs: ["flatpak-extension@23.08beta@x86_64"]
 
-nightly@x86_64:
-  extends: ['.publish_nightly', ".flatpak rules"]
-  needs: ['flatpak-extension@x86_64']
+nightly@22.08@aarch64:
+  extends: [".publish_nightly", ".flatpak rules"]
+  needs: ["flatpak-extension@22.08@aarch64"]
 
-nightly@aarch64:
-  extends: ['.publish_nightly', ".flatpak rules"]
-  needs: ['flatpak-extension@aarch64']
+nightly@23.08beta@aarch64:
+  extends: [".publish_nightly", ".flatpak rules"]
+  needs: ["flatpak-extension@23.08beta@aarch64"]