[gnome-initial-setup/wip/wjt/fdo-ci-template] ci: Switch to freedesktop/ci-templates




commit 4519dfb763a1e715a83487da7c3d28a0c970ce3f
Author: Will Thompson <will willthompson co uk>
Date:   Fri Feb 18 21:14:10 2022 +0000

    ci: Switch to freedesktop/ci-templates
    
    Shamelessly cribbed from gnome-control-center.
    
    Fixes #138

 .gitlab-ci.yml               |  78 +++++++++++++++++++++++-
 .gitlab-ci/fedora.Dockerfile |  53 -----------------
 .gitlab-ci/run-docker.sh     | 138 -------------------------------------------
 3 files changed, 77 insertions(+), 192 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02e5aaea..8c2a7695 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,86 @@
-image: registry.gitlab.gnome.org/gnome/gnome-initial-setup/fedora:v2
+include:
+ - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/11fe3571905faceef51c7253dfdaf79ece8cf062/templates/fedora.yml'
+
+variables:
+  FDO_UPSTREAM_REPO: gnome/gnome-initial-setup
 
 stages:
+  - prepare
   - build
 
+.fedora.container.common:
+  variables:
+    # When branching a stable release, change 'main'
+    # to the release number/branch to ensure that
+    # a new image will be created, tailored for the
+    # stable branch.
+    # Could probably also switch away from rawhide,
+    # to stable fedora branch as well.
+    FDO_DISTRIBUTION_TAG: '2022-02-18.0-main'
+    FDO_DISTRIBUTION_VERSION: 36
+
+# See also https://gitlab.freedesktop.org/freedesktop/ci-templates
+build.container.fedora@x86_64:
+  extends:
+  - '.fdo.container-build@fedora'
+  - '.fedora.container.common'
+  stage: 'prepare'
+  variables:
+    # no need to pull the whole tree for rebuilding the image
+    GIT_STRATEGY: none
+    # Expiry sets fdo.expires on the image
+    FDO_EXPIRES_AFTER: 8w
+    FDO_DISTRIBUTION_PACKAGES: >-
+      @c-development @development-tools
+      ccache
+      desktop-file-utils
+      gcc
+      gettext
+      git
+      gobject-introspection-devel
+      gtk-doc
+      ibus-devel
+      intltool
+      krb5-devel
+      libpwquality-devel
+      libsecret-devel
+      meson
+      ninja-build
+      "pkgconfig(accountsservice)"
+      "pkgconfig(cheese)"
+      "pkgconfig(cheese-gtk)"
+      "pkgconfig(flatpak)"
+      "pkgconfig(fontconfig)"
+      "pkgconfig(gdm)"
+      "pkgconfig(geocode-glib-1.0)"
+      "pkgconfig(gio-2.0)"
+      "pkgconfig(gio-unix-2.0)"
+      "pkgconfig(glib-2.0)"
+      "pkgconfig(gnome-desktop-3.0)"
+      "pkgconfig(goa-1.0)"
+      "pkgconfig(goa-backend-1.0)"
+      "pkgconfig(gstreamer-1.0)"
+      "pkgconfig(gtk+-3.0)"
+      "pkgconfig(gtk4)"
+      "pkgconfig(gweather-3.0)"
+      "pkgconfig(libgeoclue-2.0)"
+      "pkgconfig(libhandy-1)"
+      "pkgconfig(libnm)"
+      "pkgconfig(libnma)"
+      "pkgconfig(malcontent-ui-0)"
+      "pkgconfig(webkit2gtk-4.0)"
+      polkit-devel
+      rest-devel
+    # TODO: FDO_DISTRIBUTION_EXEC: |-
+    # build all things with wrap files
+
 .job_template: &job_definition
+  extends:
+    - '.fdo.distribution-image@fedora'
+    - '.fedora.container.common'
+
   stage: build
+
   script:
     # In general, we would like warnings to be fatal. However, code copied from
     # gnome-control-center uses many deprecated functions. Until we have a good


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