[cairo-commit] 4 commits - .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |   87 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 39 deletions(-)

New commits:
commit 3c14ef78abab5899b5454469d18b4205eaa9b25a
Merge: 7a06f65d9 61e1c9fd1
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Mon Sep 4 17:27:32 2023 +0000

    Merge branch 'ebassi/ci-static-linux-build' into 'master'
    
    ci: Add a static build on Linux
    
    See merge request cairo/cairo!507

commit 61e1c9fd1cf33547995de6c9aa234266274f2050
Author: Uli Schlachter <psychon at znc.in>
Date:   Mon Sep 4 18:17:04 2023 +0200

    Update FDO_DISTRIBUTION_TAG
    
    The previous commit touched the list of packages that are installed in
    our build container. This commit changes FDO_DISTRIBUTION_TAG to ensure
    the container is rebuild with those changes.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17d452628..aefe7d56a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ workflow:
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
   FDO_DISTRIBUTION_VERSION: '38'
-  FDO_DISTRIBUTION_TAG: '2023-04-29.1'
+  FDO_DISTRIBUTION_TAG: '2023-08-28.1'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
commit 7e3c764ff389cba8f17048523316faf7a0fa1e36
Author: Emmanuele Bassi <ebassi at gnome.org>
Date:   Mon Aug 28 22:15:11 2023 +0100

    ci: Remove autotools from the Fedora image
    
    We don't use Autotools any more.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 730d9c9fa..17d452628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,11 +84,7 @@ fedora image:
       systemd-devel
       systemd-udev
       expat-devel
-      autoconf
-      automake
-      make
       which
-      libtool
       diffutils
       xorg-x11-server-Xvfb
       dejavu-sans-fonts
commit 3a76936d66e14e19f24bf4df8c57699fc1b92434
Author: Emmanuele Bassi <ebassi at gnome.org>
Date:   Thu Aug 24 15:04:13 2023 +0100

    ci: Add a static build on Linux
    
    There are people building Cairo as a static library, so we should verify
    that we are not breaking their builds.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65549c83e..730d9c9fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,11 +98,56 @@ fedora image:
       fonttools
       util-linux
 
+.build fedora:
+  extends:
+    - '.fdo.distribution-image at fedora'
+    - '.ccache_setup'
+  stage: 'build'
+  variables:
+    MESON_ARGS: >
+      ${DEFAULT_MESON_ARGS}
+      ${EXTRA_MESON_ARGS}
+  script:
+    - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
+    - meson setup ${MESON_ARGS} builddir
+    - meson compile -C builddir
+
+    # Run test scripts
+    - mkdir builddir/src/.libs
+    - touch builddir/src/.libs/libfoo.so
+    # Run all the tests, except for the big test executable which
+    # gets run separately
+    - meson test -C builddir --no-suite=slow --print-errorlogs
+
+    # TODO: These aren't set up as Meson tests yet
+    - (cd doc/public && bash "check-doc-syntax.sh")
+    # FIXME: The following line really needs gtk-doc to run first
+    - (cd doc/public && DOC_MODULE=cairo bash "check-doc-coverage.sh")
+
+    - meson install -C builddir
+  artifacts:
+    expire_in: "7 days"
+    when: "always"
+    paths:
+      - "*"
+
+fedora build shared:
+  extends:
+    - '.build fedora'
+  variables:
+    EXTRA_MESON_ARGS: '--default-library=shared'
+
+fedora build static:
+  extends:
+    - '.build fedora'
+  variables:
+    EXTRA_MESON_ARGS: '--default-library=static'
+
 .test fedora:
   dependencies:
-    - 'fedora build'
+    - 'fedora build shared'
   needs:
-    - 'fedora build'
+    - 'fedora build shared'
   extends:
     - '.fdo.distribution-image at fedora'
     - '.ccache_setup'
@@ -221,38 +266,6 @@ test fedora xlib:
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
-fedora build:
-  extends:
-    - '.fdo.distribution-image at fedora'
-    - '.ccache_setup'
-  stage: 'build'
-  variables:
-    MESON_ARGS: >
-      ${DEFAULT_MESON_ARGS}
-  script:
-    - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
-    - meson builddir ${MESON_ARGS}
-    - ninja -C builddir
-
-    # Run test scripts
-    - mkdir builddir/src/.libs
-    - touch builddir/src/.libs/libfoo.so
-    # Run all the tests, except for the big test executable which
-    # gets run separately
-    - meson test -C builddir --no-suite=slow --print-errorlogs
-
-    # TODO: These aren't set up as Meson tests yet
-    - (cd doc/public && bash "check-doc-syntax.sh")
-    # FIXME: The following line really needs gtk-doc to run first
-    - (cd doc/public && DOC_MODULE=cairo bash "check-doc-coverage.sh")
-
-    - ninja -C builddir install
-  artifacts:
-    expire_in: "7 days"
-    when: "always"
-    paths:
-      - "*"
-
 mingw-32 build:
   extends:
     - '.fdo.distribution-image at fedora'