Skip to content

Commit

Permalink
GHA: Work around pkgconf issues (part 2)
Browse files Browse the repository at this point in the history
A recent dune release uncovered issues with pkgconf (required by cairo2
and lablgtk3) which break some builds. In the current workflow, builds
on ubuntu-20.04 and with MSVC are affected. Since we don't rely on
pkgconf, we can just remove it and let dune fall back to pkg-config.
For MSVC builds we can go even further and try to remove Cygwin from
the build environment as much as possible.
  • Loading branch information
tleedjarv committed Dec 7, 2024
1 parent 8b94462 commit 32b3b36
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,16 @@ jobs:
if: ${{ runner.os == 'Windows' && contains(matrix.job.ocaml-version, 'msvc') }}
shell: pwsh
run: |
# Prevent Cygwin env messing up the Windows build (opam will add Cygwin
# back to PATH, but still...)
# [2024-12] Somehow this was not required before a dune update that
# switched from using pkg-config to pkgconf, but doing this should not
# hurt in any case.
rm D:\cygwin\bin\pkgconf*
rm D:\cygwin\bin\pkg-config*
"PKG_CONFIG=D:\gtk\bin\pkgconf.exe" >> "${env:GITHUB_ENV}"
$env:Path = (${env:Path} -split ';' | Where-Object { $_ -Notlike "*cygwin*" }) -join ";"
##
"PATH=D:\gtk\bin;${env:Path}" >> "${env:GITHUB_ENV}"
"LIB=D:\gtk\lib;${env:LIB}" >> "${env:GITHUB_ENV}"
"INCLUDE=D:\gtk\include;D:\gtk\include\cairo;D:\gtk\include\glib-2.0;D:\gtk\include\gobject-introspection-1.0;D:\gtk\lib\glib-2.0\include;${env:INCLUDE}" >> "${env:GITHUB_ENV}"
Expand Down

0 comments on commit 32b3b36

Please sign in to comment.