[gexiv2] ci: Check against all relevant exiv2 versions



commit 28c977a3f9f08b2373e0c01d448220bd4585cb6d
Author: Jens Georg <mail jensge org>
Date:   Fri Jan 18 16:26:56 2019 +0100

    ci: Check against all relevant exiv2 versions

 .gitlab-ci.yml                            | 60 +++++++++++++--------------
 build-aux/org.gnome.GExiv2-oldstable.json | 67 +++++++++++++++++++++++++++++++
 build-aux/org.gnome.GExiv2-stable.json    | 67 +++++++++++++++++++++++++++++++
 build-aux/org.gnome.GExiv2.json           |  2 +-
 4 files changed, 165 insertions(+), 31 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42d2995..8c58995 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,20 @@
+.flatpak:
+  variables:
+      MANIFEST_PATH: "build-aux/org.gnome.GExiv2.json"
+  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30
+  stage: build
+  only:
+    - schedules
+  script:
+    - flatpak-builder build-dir ${MANIFEST_PATH} --stop-at=gexiv2
+    - flatpak build build-dir meson _build
+    - flatpak build build-dir ninja -C _build
+    - flatpak build build-dir ninja -C _build test
+  artifacts:
+    when: on_failure
+    name: "gexiv2-_${CI_COMMIT_REF_NAME}"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .fedora:
   image: fedora:latest
@@ -16,24 +33,19 @@ stages:
   - deploy
 
 exiv2-master:on-schedule:
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30
-  stage: build
-  only:
-    - schedules
-  script:
-    - flatpak-builder build-dir build-aux/org.gnome.GExiv2.json --stop-at=gexiv2
-    - flatpak build build-dir meson _build
-    - flatpak build build-dir ninja -C _build
-    - flatpak build build-dir ninja -C _build test
-  artifacts:
-    when: on_failure
-    name: "gexiv2-_${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-  cache:
-    paths:
-      - .flatpak-builder/downloads
-      - .flatpak-builder/git
+    extends: .flatpak
+    variables:
+        MANIFEST_PATH: "build-aux/org.gnome.GExiv2.json"
+
+exiv2-stable:on-schedule:
+    extends: .flatpak
+    variables:
+        MANIFEST_PATH: "build-aux/org.gnome.GExiv2-stable.json"
+
+exiv2-oldstable:on-schedule:
+    extends: .flatpak
+    variables:
+        MANIFEST_PATH: "build-aux/org.gnome.GExiv2-oldstable.json"
 
 build-job:
   extends: .fedora
@@ -59,18 +71,6 @@ test:
 # FIXME: Run gtkdoc-check when we can. See:
 # https://github.com/mesonbuild/meson/issues/3580
 
-dist-job:
-  extends: .fedora
-  stage: build
-  only:
-    - tags
-  script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype release _build .
-    - ninja -C _build dist
-  artifacts:
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-dist/gexiv2-*.tar.xz"
-
 pages:
   stage: deploy
   extends: .fedora
diff --git a/build-aux/org.gnome.GExiv2-oldstable.json b/build-aux/org.gnome.GExiv2-oldstable.json
new file mode 100644
index 0000000..faa8c58
--- /dev/null
+++ b/build-aux/org.gnome.GExiv2-oldstable.json
@@ -0,0 +1,67 @@
+{
+    "app-id" : "org.gnome.GExiv2",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.30",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "gexiv2",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "cleanup" : [
+        "/include",
+        "/lib/pkconfig",
+        "/share/pkgconfig",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/vala",
+        "/lib/girepository",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "exiv2",
+            "cleanup" : [
+                "/bin"
+            ],
+            "buildsystem" : "cmake-ninja",
+            "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
+                "-DEXIV2_BUILD_SAMPLES=OFF"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/Exiv2/exiv2/";,
+                    "branch" : "0.26"
+                }
+            ]
+        },
+        {
+            "name" : "gexiv2",
+            "buildsystem" : "meson",
+            "cleanup" : [
+                "/lib/girepository-1.0",
+                "/share/gir-1.0"
+            ],
+            "config-opts" : [
+                "-Dpython2-girdir=no",
+                "-Dpython3-girdir=no"
+            ],
+            "build-options" : {
+                "env" : {
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR" : "/app/share/gir-1.0",
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR" : "/app/lib/girepository-1.0"
+                }
+            },
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git/";
+                }
+            ]
+        }
+    ]
+}
diff --git a/build-aux/org.gnome.GExiv2-stable.json b/build-aux/org.gnome.GExiv2-stable.json
new file mode 100644
index 0000000..2bccdb3
--- /dev/null
+++ b/build-aux/org.gnome.GExiv2-stable.json
@@ -0,0 +1,67 @@
+{
+    "app-id" : "org.gnome.GExiv2",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.30",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "gexiv2",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "cleanup" : [
+        "/include",
+        "/lib/pkconfig",
+        "/share/pkgconfig",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/vala",
+        "/lib/girepository",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "exiv2",
+            "cleanup" : [
+                "/bin"
+            ],
+            "buildsystem" : "cmake-ninja",
+            "config-opts" : [
+                "-DCMAKE_INSTALL_LIBDIR=lib",
+                "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",
+                "-DEXIV2_BUILD_SAMPLES=OFF"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/Exiv2/exiv2/";,
+                    "branch" : "0.27"
+                }
+            ]
+        },
+        {
+            "name" : "gexiv2",
+            "buildsystem" : "meson",
+            "cleanup" : [
+                "/lib/girepository-1.0",
+                "/share/gir-1.0"
+            ],
+            "config-opts" : [
+                "-Dpython2-girdir=no",
+                "-Dpython3-girdir=no"
+            ],
+            "build-options" : {
+                "env" : {
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR" : "/app/share/gir-1.0",
+                    "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR" : "/app/lib/girepository-1.0"
+                }
+            },
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git/";
+                }
+            ]
+        }
+    ]
+}
diff --git a/build-aux/org.gnome.GExiv2.json b/build-aux/org.gnome.GExiv2.json
index 4ad0e1c..a1fd741 100644
--- a/build-aux/org.gnome.GExiv2.json
+++ b/build-aux/org.gnome.GExiv2.json
@@ -25,7 +25,7 @@
             "cleanup" : [
                 "/bin"
             ],
-            "buildsystem" : "cmake",
+            "buildsystem" : "cmake-ninja",
             "config-opts" : [
                 "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DEXIV2_BUILD_EXIV2_COMMAND=OFF",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]