From a08e9587b3ed147be4d0bb8b05bc7ad9c50ebe7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Thu, 25 Jan 2024 21:10:18 +0100
Subject: [PATCH] ci: Tweak some more

---
 .github/actions/setup-windows-env/action.yml | 6 +++++-
 .github/workflows/ci.yml                     | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-windows-env/action.yml b/.github/actions/setup-windows-env/action.yml
index ad01e58eb..95e23355d 100644
--- a/.github/actions/setup-windows-env/action.yml
+++ b/.github/actions/setup-windows-env/action.yml
@@ -17,10 +17,14 @@ runs:
         }
         $platform = $platforms[$arch]
         (Resolve-Path 'toolchain-windows\bin').Path >> $Env:GITHUB_PATH
+        echo '=== Environment before:'
+        cat $Env:GITHUB_ENV
+        echo '==='
         echo PKG_CONFIG_PATH=$(Resolve-Path "sdk-windows\$platform-Release\lib\pkgconfig")
         echo PKG_CONFIG_PATH=$(Resolve-Path "sdk-windows\$platform-Release\lib\pkgconfig") >> $Env:GITHUB_ENV
-        echo '=== Environment contains:'
+        echo '=== Environment after:'
         cat $Env:GITHUB_ENV
+        echo '==='
       shell: pwsh
     - name: Set up Python
       uses: actions/setup-python@v5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index adcfad51b..72e47ef04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Build
         run: |
           $prefix = 'build\frida-windows-${{ matrix.arch }}'
-          $builddir = 'build\tmp-windows-${{ matrix.arch }}'
+          $builddir = 'build\tmp-windows-${{ matrix.arch }}\frida-gum'
           mkdir $prefix
           meson setup `
             --prefix "$(Resolve-Path $prefix)" `
@@ -74,7 +74,9 @@ jobs:
             -Dgumpp=enabled `
             -Dgumjs=enabled `
             $builddir
-          meson compile -C $builddir
+          cat $builddir\meson-logs\meson-log.txt
+
+          #meson compile -C $builddir
       #- name: Build Gum devkit
       #  run: |
       #    cp frida-gum\build build