Skip to content

Commit

Permalink
ci: Tweak some more
Browse files Browse the repository at this point in the history
  • Loading branch information
oleavr committed Jan 25, 2024
1 parent fc9b305 commit a08e958
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .github/actions/setup-windows-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)" `
Expand All @@ -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
Expand Down

0 comments on commit a08e958

Please sign in to comment.