diff --git a/.gitlab-ci/build.yml b/.gitlab-ci/build.yml index e38da370..8a44d5e9 100644 --- a/.gitlab-ci/build.yml +++ b/.gitlab-ci/build.yml @@ -29,8 +29,8 @@ build@aarch64: .build-stable: image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-46' variables: - MANIFEST_PATH: ".gitlab-ci/org.gnome.Fractal.CiTest.json" - APP_ID: "org.gnome.Fractal.CiTest" + MANIFEST_PATH: ".gitlab-ci/org.gnome.Fractal.CiBuildStable.yml" + APP_ID: "org.gnome.Fractal.CiBuildStable" RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo" BUNDLE: "${APP_ID}.flatpak" RUN_TESTS: 0 diff --git a/.gitlab-ci/org.gnome.Fractal.CiBuildStable.yml b/.gitlab-ci/org.gnome.Fractal.CiBuildStable.yml new file mode 100644 index 00000000..385a7085 --- /dev/null +++ b/.gitlab-ci/org.gnome.Fractal.CiBuildStable.yml @@ -0,0 +1,53 @@ +id: org.gnome.Fractal.CiBuildStable +runtime: org.gnome.Platform +runtime-version: '46' +sdk: org.gnome.Sdk +sdk-extensions: + - org.freedesktop.Sdk.Extension.rust-stable + - org.freedesktop.Sdk.Extension.llvm16 +command: fractal +finish-args: + - --socket=fallback-x11 + - --socket=wayland + - --socket=pulseaudio + - --share=network + - --share=ipc + - --device=dri +build-options: + append-ld-library-path: /usr/lib/sdk/llvm16/lib + append-path: /usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin + build-args: + - --share=network + test-args: + - --socket=x11 + - --share=network +modules: + - name: protobuf-c + buildsystem: autotools + config-opts: + - --disable-protoc + sources: + - type: git + url: https://github.com/protobuf-c/protobuf-c.git + tag: v1.5.0 + commit: 8c201f6e47a53feaab773922a743091eb6c8972a + - name: libshumate + buildsystem: meson + config-opts: + - -Dgir=false + - -Dvapi=false + - -Dgtk_doc=false + - -Dvector_renderer=true + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/libshumate.git + tag: 1.2.2 + commit: fab290f36bb7043fe6107308ff4f91c80492aa11 + - name: fractal + buildsystem: meson + run-tests: true + config-opts: + - -Dprofile=default + sources: + - type: dir + path: ../ diff --git a/.gitlab-ci/org.gnome.Fractal.CiTest.json b/.gitlab-ci/org.gnome.Fractal.CiTest.json deleted file mode 100644 index 61d3d7f6..00000000 --- a/.gitlab-ci/org.gnome.Fractal.CiTest.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "id": "org.gnome.Fractal.CiTest", - "runtime": "org.gnome.Platform", - "runtime-version": "46", - "sdk": "org.gnome.Sdk", - "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm16" - ], - "command": "fractal", - "finish-args": [ - "--socket=fallback-x11", - "--socket=wayland", - "--socket=pulseaudio", - "--share=network", - "--share=ipc", - "--device=dri" - ], - "build-options": { - "append-ld-library-path": "/usr/lib/sdk/llvm16/lib", - "append-path": "/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin", - "build-args": [ - "--share=network" - ], - "test-args": [ - "--socket=x11", - "--share=network" - ] - }, - "modules": [ - { - "name": "protobuf-c", - "buildsystem": "autotools", - "config-opts": [ - "--disable-protoc" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/protobuf-c/protobuf-c.git", - "tag": "v1.5.0", - "commit": "8c201f6e47a53feaab773922a743091eb6c8972a" - } - ] - }, - { - "name": "libshumate", - "buildsystem": "meson", - "config-opts": [ - "-Dgir=false", - "-Dvapi=false", - "-Dgtk_doc=false", - "-Dvector_renderer=true" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/libshumate.git", - "tag": "1.2.2", - "commit": "fab290f36bb7043fe6107308ff4f91c80492aa11" - } - ] - }, - { - "name": "fractal", - "buildsystem": "meson", - "run-tests": true, - "config-opts": [ - "-Dprofile=default" - ], - "sources": [ - { - "type": "dir", - "path": "../" - } - ] - } - ] -}