From e3ba30bf7e56c4c9317d6174db20375097b2f2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 1 Oct 2021 16:38:43 +0100 Subject: [PATCH 1/2] 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 --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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. From ccb57d21ce0069631b8a723bddc9ed05c3e5bbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 3 Oct 2021 13:10:12 +0100 Subject: [PATCH 2/2] ci: disable aarch64 neon asm in pixman to fix android build To work around build failures, see #515 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: