ci: Tweak some more

frida · Jan 25, 2024 · eb0ef3a · eb0ef3a
1 parent a08e958
commit eb0ef3a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/.github/actions/setup-windows-env/action.yml b/.github/actions/setup-windows-env/action.yml
@@ -7,6 +7,17 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '${{ env.PYTHON_VERSION }}'
+    - name: Install Meson
+      run: pip install meson==${{ env.MESON_VERSION }}
+      shell: pwsh
+    - name: Set up MSVS environment
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ inputs.architecture }}
     - name: Activate Frida toolchain and SDK
       run: |
         $arch = '${{ inputs.architecture }}'
@@ -17,23 +28,5 @@ 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 after:'
-        cat $Env:GITHUB_ENV
-        echo '==='
       shell: pwsh
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '${{ env.PYTHON_VERSION }}'
-    - name: Install Meson
-      run: pip install meson==${{ env.MESON_VERSION }}
-      shell: pwsh
-    - name: Set up MSVS environment
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: ${{ inputs.architecture }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,9 +74,7 @@ jobs:
             -Dgumpp=enabled `
             -Dgumjs=enabled `
             $builddir
-          cat $builddir\meson-logs\meson-log.txt
-
-          #meson compile -C $builddir
+          meson install -C $builddir
       #- name: Build Gum devkit
       #  run: |
       #    cp frida-gum\build build