From d402214b8a306f8981ce004fa18889870cb9643d Mon Sep 17 00:00:00 2001 From: DjLegolas Date: Fri, 19 Apr 2024 03:09:11 +0300 Subject: [PATCH 1/2] build: fix python search for gobject integration When compiling with Gobject integration on Windows, the build fails because it finds the incorrect python interpreter. Closes: #265 --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 081be2b..383f437 100644 --- a/src/meson.build +++ b/src/meson.build @@ -99,7 +99,7 @@ graphene_dep_sources = [] # Introspection if build_gir - python = python.find_installation('python3') + python = python.find_installation() identfilter_py = meson.current_source_dir() / 'identfilter.py' gir_extra_args = [ From 8ab2d7a9b16e74128d74de9b452aec862153092d Mon Sep 17 00:00:00 2001 From: DjLegolas Date: Sat, 17 Aug 2024 00:31:06 +0300 Subject: [PATCH 2/2] CI: add testing with GTK build for Windows (msvc) Closes: #265 --- .github/workflows/msvc-env.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/msvc-env.yml b/.github/workflows/msvc-env.yml index 5cbe0dc..0dffb42 100644 --- a/.github/workflows/msvc-env.yml +++ b/.github/workflows/msvc-env.yml @@ -9,15 +9,35 @@ on: jobs: build: runs-on: windows-latest + name: Build with introspection=${{ matrix.build_introspection }} env: PYTHONIOENCODING: "utf-8" + GIR_BUILD: "" + strategy: + fail-fast: false + matrix: + build_introspection: [ true, false ] steps: - uses: actions/checkout@master - uses: actions/setup-python@v1 + with: + python-version: '3.12' - uses: seanmiddleditch/gha-setup-vsdevenv@master + - name: Install GTK + if: matrix.build_introspection + run: | + $WebClient = New-Object System.Net.WebClient + $WebClient.DownloadFile("https://github.com/wingtk/gvsbuild/releases/download/2024.8.1/GTK4_Gvsbuild_2024.8.1_x64.zip","C:\GTK.zip") + 7z x C:\GTK.zip -oC:\GTK + echo "C:\GTK\lib" | Out-File -FilePath $env:GITHUB_PATH -Append + echo "C:\GTK\bin" | Out-File -FilePath $env:GITHUB_PATH -Append + echo "C:\GTK" | Out-File -FilePath $env:GITHUB_PATH -Append + echo "GIR_BUILD=-Dintrospection=enabled" >> $GITHUB_ENV + python -m pip install setuptools - uses: BSFishy/meson-build@v1.0.3 with: action: test directory: _build + setup-options: ${{ env.GIR_BUILD }} options: "--verbose" meson-version: "1.0.0"