From 3a4d5ff5c306b410dc8cb681949c7e6967c38346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 8 Feb 2024 00:36:20 +0100 Subject: [PATCH 1/7] ci: Build demos for macOS --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5a172b390..2231a60ba2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,6 @@ macos-x86_64: -Dcpp_std=c++11 -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled - -Dbuild-demos=false -Dbuild-examples=false -Dbuild-testsuite=false _build From 9628599620083d61c4a13b7be2e5114f8b24c8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 8 Feb 2024 00:46:06 +0100 Subject: [PATCH 2/7] ci: Build examples for macOS --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2231a60ba2..da9971c992 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,6 @@ macos-x86_64: -Dcpp_std=c++11 -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled - -Dbuild-examples=false -Dbuild-testsuite=false _build - meson compile -C _build From a48a2a3dc9540eb17b9e8eabdbeb6b8c72b03551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 8 Feb 2024 00:53:26 +0100 Subject: [PATCH 3/7] ci: Build testsuite for macOS To make it work on macOS, do not add typelibdir to GI_TYPELIB_PATH. While this change affects all the other jobs as well, it appears to be of no consequence. --- .gitlab-ci.yml | 1 - testsuite/headless/meson.build | 1 - testsuite/introspection/meson.build | 1 - 3 files changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da9971c992..445ba53238 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,6 @@ macos-x86_64: -Dcpp_std=c++11 -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled - -Dbuild-testsuite=false _build - meson compile -C _build artifacts: diff --git a/testsuite/headless/meson.build b/testsuite/headless/meson.build index 1c9b5f5a78..1e9bf36a61 100644 --- a/testsuite/headless/meson.build +++ b/testsuite/headless/meson.build @@ -1,7 +1,6 @@ env = environment() env.prepend('GI_TYPELIB_PATH', project_build_root / 'gtk', - gi_dep.get_variable(pkgconfig: 'typelibdir'), ) env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so') env.prepend('MESON_CURRENT_SOURCE_DIR', meson.current_source_dir()) diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build index a30c687353..a65965d633 100644 --- a/testsuite/introspection/meson.build +++ b/testsuite/introspection/meson.build @@ -1,7 +1,6 @@ env = environment() env.prepend('GI_TYPELIB_PATH', project_build_root / 'gtk', - gi_dep.get_variable(pkgconfig: 'typelibdir'), ) env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so') From b4b42a462a0aef84cf8af96081cd1fb649a4094b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 15 Feb 2024 01:11:43 +0100 Subject: [PATCH 4/7] ci: Enable pixman tests for macOS --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 445ba53238..0639f0f3c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,7 +251,6 @@ macos-x86_64: -Dmedia-gstreamer=disabled -Dintrospection=enabled -Dcpp_std=c++11 - -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled _build - meson compile -C _build From 2e6b32083e9633f45f87930754ce698c0574844a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 15 Feb 2024 01:12:29 +0100 Subject: [PATCH 5/7] ci: Enable simd for libjpeg-turbo on macOS --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0639f0f3c4..ddd11f506c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,7 +251,6 @@ macos-x86_64: -Dmedia-gstreamer=disabled -Dintrospection=enabled -Dcpp_std=c++11 - -Dlibjpeg-turbo:simd=disabled _build - meson compile -C _build artifacts: From 6d9662cf8df2607d32529fe20483c860c0026799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 15 Feb 2024 01:13:10 +0100 Subject: [PATCH 6/7] ci: Do not set c++11 for macOS --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddd11f506c..c742c4c28e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -250,7 +250,6 @@ macos-x86_64: -Dmacos-backend=true -Dmedia-gstreamer=disabled -Dintrospection=enabled - -Dcpp_std=c++11 _build - meson compile -C _build artifacts: From dff8e34bc965d98be0e3ba49d5e7bb93301b3dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 15 Feb 2024 01:14:44 +0100 Subject: [PATCH 7/7] ci: Refactor job to use flags --- .gitlab-ci.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c742c4c28e..f3a56e2771 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,13 +221,14 @@ macos-x86_64: - macosintel needs: [] variables: - MESON_FORCE_BACKTRACKE: 1 + EXTRA_MESON_FLAGS: "" + BACKEND_FLAGS: "-Dx11-backend=false -Dbroadway-backend=true" + FEATURE_FLAGS: "-Dmedia-gstreamer=disabled -Dintrospection=enabled -Dgobject-introspection:werror=false" TMPDIR: /Users/Shared/work/tmp SDKROOT: /opt/sdks/MacOSX10.13.4.sdk PIP_CACHE_DIR: /Users/Shared/build/cache PIPENV_CACHE_DIR: $PIP_CACHE_DIR PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR - EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false" before_script: # Not using ccache on purpose as it accelerates the build so much that it # can trigger race conditions in the gobject-introspection subproject. @@ -245,11 +246,8 @@ macos-x86_64: - meson setup ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} - -Dx11-backend=false - -Dbroadway-backend=true - -Dmacos-backend=true - -Dmedia-gstreamer=disabled - -Dintrospection=enabled + ${BACKEND_FLAGS} + ${FEATURE_FLAGS} _build - meson compile -C _build artifacts: @@ -473,3 +471,4 @@ publish-docs: - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline" rules: - if: $CI_COMMIT_REF_NAME == "main" +