From e76bfcf2f62a90c84cb77947f8de502afaf40f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Sun, 18 Feb 2024 20:09:20 +0100 Subject: [PATCH] ci: Remove pygobject, pycairo and cmake They are not required anymore. Use the system's Python 3 as we no longer need to match the version with the externally provided wheels for pygobject and pycairo (courtesy of Inkscape's CI that also runs on that machine). --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3a56e2771..e1c26e59cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -233,15 +233,12 @@ macos-x86_64: # Not using ccache on purpose as it accelerates the build so much that it # can trigger race conditions in the gobject-introspection subproject. - bash .gitlab-ci/show-info-osx.sh - - /opt/macports/bin/python3.10 -m venv .venv - - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin + - python3 -m venv .venv - ln -s /opt/pkg-config/bin/pkg-config .venv/bin - ln -s /opt/bison/bin/bison .venv/bin - source .venv/bin/activate - pip3 install meson==1.2.0 - pip3 install ninja==1.11.1 - - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl - /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl script: - meson setup ${COMMON_MESON_FLAGS}