Apply fixes suggested by LLM

p2panda · Dec 7, 2024 · 69b5993 · 69b5993
1 parent 5738fa5
commit 69b5993
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -109,14 +109,27 @@ jobs:
           $arch = "${{ matrix.arch }}"
           $triplet = if ($arch -eq "x64") { "x64-windows" } else { "arm64-windows" }
 
-          vcpkg install glib:$triplet
-          echo "C:\vcpkg\installed\$triplet\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          echo "PKG_CONFIG_PATH=C:\vcpkg\installed\$triplet\lib\pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        shell: pwsh
+          # Install both pkg-config and glib
+          vcpkg install pkgconf:$triplet glib:$triplet
 
-      - name: Set pkg-config path
-        run: |
-          echo "PKG_CONFIG=C:\vcpkg\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin\pkg-config.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          # Set up various required paths
+          $vcpkgRoot = "C:\vcpkg"
+          $installPrefix = "$vcpkgRoot\installed\$triplet"
+
+          # Add necessary paths to PATH
+          echo "$installPrefix\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "$vcpkgRoot\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+          # Set pkg-config related environment variables
+          echo "PKG_CONFIG=$vcpkgRoot\downloads\tools\pkgconfig\windows\pkg-config-0.29.2-3\tools\pkg-config-0.29.2\bin\pkg-config.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_PATH=$installPrefix\lib\pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_LIBDIR=$installPrefix\lib\pkgconfig" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_ALLOW_CROSS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+          # Verify pkg-config installation and paths
+          pkg-config --version
+          pkg-config --debug --print-errors --cflags --libs glib-2.0
         shell: pwsh
       - name: Build
         run: |