From ee52e5a530bc4ad93a605add9a1ce184de3f0d9c Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sun, 30 Jun 2024 20:41:47 +0300 Subject: [PATCH] flatpak: Publish the nightly sdk extension for 24.08beta And stop building for 22.08 --- .gitlab-ci.yml | 34 +++++++++---------- ...freedesktop.Sdk.Extension.vala-nightly.yml | 10 +++--- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9d956d08..8e56e0385 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,44 +14,44 @@ include: "https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ EXPORT_RUNTIME: "--runtime" RUN_TESTS: "no" -.vars-22.08: +.vars-23.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' + # Use the image from the last stable runtime that includes 23.08 sdk + image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-46' variables: - BRANCH: "22.08" + BRANCH: "23.08" -.vars-23.08: +.vars-24.08: extends: [".vars-extension"] variables: - BRANCH: "23.08" + BRANCH: "24.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"] + - sed -i "s/23.08/$BRANCH/g" $MANIFEST_PATH flatpak-extension@23.08@x86_64: extends: [".flatpak@x86_64", ".vars-23.08"] -flatpak-extension@22.08@aarch64: - extends: [".flatpak@aarch64", ".vars-22.08"] +flatpak-extension@24.08@x86_64: + extends: [".flatpak@x86_64", ".vars-24.08"] flatpak-extension@23.08@aarch64: extends: [".flatpak@aarch64", ".vars-23.08"] -nightly@22.08@x86_64: - extends: [".publish_nightly", ".flatpak rules"] - needs: ["flatpak-extension@22.08@x86_64"] +flatpak-extension@24.08@aarch64: + extends: [".flatpak@aarch64", ".vars-24.08"] nightly@23.08@x86_64: extends: [".publish_nightly", ".flatpak rules"] needs: ["flatpak-extension@23.08@x86_64"] -nightly@22.08@aarch64: +nightly@24.08@x86_64: extends: [".publish_nightly", ".flatpak rules"] - needs: ["flatpak-extension@22.08@aarch64"] + needs: ["flatpak-extension@24.08@x86_64"] nightly@23.08@aarch64: extends: [".publish_nightly", ".flatpak rules"] needs: ["flatpak-extension@23.08@aarch64"] + +nightly@24.08@aarch64: + extends: [".publish_nightly", ".flatpak rules"] + needs: ["flatpak-extension@24.08@aarch64"] diff --git a/build-aux/flatpak/org.freedesktop.Sdk.Extension.vala-nightly.yml b/build-aux/flatpak/org.freedesktop.Sdk.Extension.vala-nightly.yml index a0c134e28..7d8ec6306 100644 --- a/build-aux/flatpak/org.freedesktop.Sdk.Extension.vala-nightly.yml +++ b/build-aux/flatpak/org.freedesktop.Sdk.Extension.vala-nightly.yml @@ -1,9 +1,9 @@ id: "org.freedesktop.Sdk.Extension.vala-nightly" -branch: "22.08" +branch: "23.08" runtime: "org.freedesktop.Sdk" build-extension: true sdk: "org.freedesktop.Sdk" -runtime-version: "22.08" +runtime-version: "23.08" sdk-extensions: ["org.freedesktop.Sdk.Extension.vala"] separate-locales: false appstream-compose: false @@ -77,6 +77,9 @@ modules: cleanup: ["/lib/pkgconfig"] - name: gee buildsystem: autotools + build-options: + # GCC 14 doesn't like this libgee release + cflags: -Wno-error=incompatible-pointer-types sources: - type: archive url: "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.tar.xz" @@ -114,5 +117,4 @@ modules: build-commands: - mkdir -p ${FLATPAK_DEST}/share/metainfo - cp ${FLATPAK_ID}.appdata.xml ${FLATPAK_DEST}/share/metainfo - - appstream-compose --basename ${FLATPAK_ID} --prefix=${FLATPAK_DEST} --origin=flatpak - ${FLATPAK_ID} + - appstreamcli compose --components=${FLATPAK_ID} --prefix=/ --origin=${FLATPAK_ID} --result-root=${FLATPAK_DEST} --data-dir=${FLATPAK_DEST}/share/app-info/xmls ${FLATPAK_DEST} -- 2.47.2