From df3b2c537b29b7893a4b4142150d70e8203d6da1 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 20 Mar 2023 01:01:23 +0200 Subject: [PATCH 1/2] test-msvc.bat: update meson commands --- .gitlab-ci/test-msvc.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index c985c413fca..a72a2e04100 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -6,8 +6,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar :: FIXME: make warnings fatal pip3 install --upgrade --user meson~=0.64 || goto :error -meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error -ninja -C _build || goto :error +meson setup -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error +meson compile -C _build || goto :error goto :EOF :error -- GitLab From 22f276c16f10136c7a740d3cb8d845a550e8f24c Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 20 Mar 2023 01:09:56 +0200 Subject: [PATCH 2/2] test-msvc: Install gtk into destdir and extract it into CI artifacts --- .gitlab-ci.yml | 4 ++++ .gitlab-ci/test-msvc.bat | 4 +++- subprojects/cairo.wrap | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d22e3798d4..4ffe5b23fe7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,10 +223,14 @@ vs2017-x64: needs: [] script: - .gitlab-ci/test-msvc.bat + # FIXME: only do this for main probably + - Compress-Archive -LiteralPath $CI_PROJECT_DIR\destdir -DestinationPath $CI_PROJECT_DIR\msvc-binaries-$CI_COMMIT_SHORT_SHA.zip artifacts: when: always + expire_in: 1 day paths: - "${CI_PROJECT_DIR}/_build/meson-logs" + - "${CI_PROJECT_DIR}/msvc-binaries-${CI_COMMIT_SHORT_SHA}.zip" .flatpak-defaults: image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master" diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index a72a2e04100..65aaaeb5b54 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -6,8 +6,10 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar :: FIXME: make warnings fatal pip3 install --upgrade --user meson~=0.64 || goto :error -meson setup -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error +:: FIXME: we should not need fontconfig=disabled +meson setup --prefix="C:\gtk4" -Ddebug=false -Dmedia-gstreamer=disabled _build -Dcairo:fontconfig=disabled -Dpango:fontconfig=disabled || goto :error meson compile -C _build || goto :error +meson install --destdir=%CI_PROJECT_DIR%\destdir -C _build || goto :error goto :EOF :error diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap index 58fd1077222..b1ab2b1afb4 100644 --- a/subprojects/cairo.wrap +++ b/subprojects/cairo.wrap @@ -1,8 +1,8 @@ [wrap-git] directory = cairo -url = https://gitlab.freedesktop.org/cairo/cairo.git -push-url = ssh://git@gitlab.freedesktop.org:cairo/cairo.git -revision = 1.17.6 +url = https://gitlab.freedesktop.org/kepstin/cairo.git +push-url = ssh://git@gitlab.freedesktop.org:kepstin/cairo.git +revision = windows-fontconfig-option depth = 1 [provide] -- GitLab