refactor: Simplify pkg-config environment setup in GitHub workflow

p2panda · Dec 8, 2024 · c9b7ddf · c9b7ddf
1 parent d2a076c
commit c9b7ddf
Showing 1 changed file with 21 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -259,45 +259,34 @@ jobs:
       - name: Configure pkg-config paths
         run: |
           $installPrefix = "$env:VCPKG_ROOT\installed\$env:VCPKG_TRIPLET"
-          
-          # Set up pkg-config environment
+
           $env:PKG_CONFIG = "$installPrefix\tools\pkgconf\pkg-config.bat"
-          $env:PKG_CONFIG_PATH = "$installPrefix\lib\pkgconfig"
-          $env:PKG_CONFIG_LIBDIR = "$installPrefix\lib\pkgconfig"
+          # Use forward slashes and ensure the correct directory
+          $pkgConfigDir = "$installPrefix/lib/pkgconfig"
+          $pkgConfigDir = $pkgConfigDir -replace "\\","/"
+
+          $env:PKG_CONFIG_PATH = $pkgConfigDir
+          $env:PKG_CONFIG_LIBDIR = $pkgConfigDir
           $env:PKG_CONFIG_ALLOW_CROSS = "1"
           $env:PKG_CONFIG_ALLOW_SYSTEM_CFLAGS = "1"
           $env:PKG_CONFIG_ALLOW_SYSTEM_LIBS = "1"
-          
-          # Add GTK4 specific environment variables
           $env:GTK_INSTALL_PREFIX = "$installPrefix"
           $env:GTK_LIBDIR = "$installPrefix\lib"
           $env:GTK_INCLUDEDIR = "$installPrefix\include"
-          
-          # Add required paths to system PATH
-          $env:Path = "$installPrefix\bin;$installPrefix\tools\pkgconf;$env:Path"
-          
-          # Export variables to GITHUB_ENV
-          @(
-            "PKG_CONFIG=$env:PKG_CONFIG",
-            "PKG_CONFIG_PATH=$env:PKG_CONFIG_PATH",
-            "PKG_CONFIG_LIBDIR=$env:PKG_CONFIG_LIBDIR",
-            "PKG_CONFIG_ALLOW_CROSS=1",
-            "PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1",
-            "PKG_CONFIG_ALLOW_SYSTEM_LIBS=1",
-            "GTK_INSTALL_PREFIX=$env:GTK_INSTALL_PREFIX",
-            "GTK_LIBDIR=$env:GTK_LIBDIR",
-            "GTK_INCLUDEDIR=$env:GTK_INCLUDEDIR"
-          ) | ForEach-Object {
-            $_ | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          }
-          
-          # Add to PATH for subsequent steps
-          @(
-            "$installPrefix\bin",
-            "$installPrefix\tools\pkgconf"
-          ) | ForEach-Object {
-            $_ | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          }
+
+          echo "PKG_CONFIG=$env:PKG_CONFIG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_PATH=$env:PKG_CONFIG_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "PKG_CONFIG_LIBDIR=$env:PKG_CONFIG_LIBDIR" | 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
+          echo "PKG_CONFIG_ALLOW_SYSTEM_LIBS=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "GTK_INSTALL_PREFIX=$env:GTK_INSTALL_PREFIX" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "GTK_LIBDIR=$env:GTK_LIBDIR" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          echo "GTK_INCLUDEDIR=$env:GTK_INCLUDEDIR" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+          $env:Path = "$installPrefix/bin;$installPrefix/tools/pkgconf;$env:Path"
+          "$installPrefix/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          "$installPrefix/tools/pkgconf" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         shell: pwsh
 
       - name: Verify pkg-config setup