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

[GitLab Mirror]

 .gitlab-ci.yml |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b63dc83c8b7844778cec2fa4bebea2651e397755
Merge: d87fe096b ccb57d21c
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Oct 4 02:35:50 2021 +0000

    Merge branch 'ci-update-windows-image' into 'master'
    
    ci: update windows image and fix pixman build on android
    
    Closes #515
    
    See merge request cairo/cairo!257

commit ccb57d21ce0069631b8a723bddc9ed05c3e5bbf7
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sun Oct 3 13:10:12 2021 +0100

    ci: disable aarch64 neon asm in pixman to fix android build
    
    To work around build failures, see #515

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c0fac142..7aaf78b84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -311,7 +311,7 @@ meson android arm64 fedora:
       ar          = toolchain + '-ar'
       strip       = toolchain + '-strip'
       EOF
-    - meson setup --cross-file android-cross-file.txt build
+    - meson setup --cross-file android-cross-file.txt -Dpixman:a64-neon=disabled build
     - meson compile --verbose -C build
 
 meson macOS:
commit e3ba30bf7e56c4c9317d6174db20375097b2f2f4
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Fri Oct 1 16:38:43 2021 +0100

    ci: update windows image
    
    Some root certs expired, which causes problems with letsencrypt
    certificates, so update to latest image with updated certificates.
    
    https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/
    
    Fixes #515

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11f45725a..2c0fac142 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
   FDO_DISTRIBUTION_TAG: '2021-08-26.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one.
-  WINDOWS_IMAGE:             "registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v16-master"
+  WINDOWS_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer/amd64/windows:2021-10-01.0-master"
 
   DEFAULT_MESON_ARGS: >
     --default-library=both
@@ -246,7 +246,9 @@ fedora meson build:
 
     # Copy GLib from existing subproject cache to avoid downloading it
     - cd $env:CI_PROJECT_DIR
-    - cp -r C:/subprojects/glib subprojects/
+    # FIXME: current windows image is missing the subproject cache,
+    # re-add this once the image has been fixed to include it again
+    # - cp -r C:/subprojects/glib subprojects/
 
     # For some reason, options are separated by newline instead of space, so we
     # have to replace them first.