fix(ci): correct OffsetFinder exe path and remove workflow path filters

- build-and-release.yml: \ now points to SolutionDir/<Platform>/Release/
  (the .sln build outputs there, not <ProjectDir>/<Platform>/Release/)
- build-offsetfinder.yml: build via RDPWrapOffsetFinder.sln /t:RDPWrapOffsetFinder
  so \ resolves to the submodule root where zydis/ lives; fix
  matching \ output path
- Remove pull_request paths: filters from all four PR check workflows so
  required status checks always run on every PR and never block merges
pull/4062/head
Simon Jackson 1 month ago
parent 4bc0f7c0c2
commit 3e0f39c7b3

@ -131,7 +131,8 @@ jobs:
/v:minimal /v:minimal
$arch = $cfg.Arch $arch = $cfg.Arch
$exeSrc = "src-csharp/RDPOffsetFinder/RDPWrapOffsetFinder/$($cfg.Platform)/Release/RDPWrapOffsetFinder.exe" # .sln build outputs to SolutionDir/<Platform>/Release/ (not <ProjectDir>/<Platform>/Release/)
$exeSrc = "src-csharp/RDPOffsetFinder/$($cfg.Platform)/Release/RDPWrapOffsetFinder.exe"
$dllSrc = "src-csharp/RDPOffsetFinder/zydis/msvc/bin/$($cfg.ZydisBin)/Zydis.dll" $dllSrc = "src-csharp/RDPOffsetFinder/zydis/msvc/bin/$($cfg.ZydisBin)/Zydis.dll"
Copy-Item $exeSrc ".\RDPWrapOffsetFinder_$arch.exe" Copy-Item $exeSrc ".\RDPWrapOffsetFinder_$arch.exe"
Copy-Item $dllSrc ".\Zydis_$arch.dll" Copy-Item $dllSrc ".\Zydis_$arch.dll"

@ -7,8 +7,6 @@
on: on:
pull_request: pull_request:
branches: [main, master] branches: [main, master]
paths:
- 'src-x86-x64-Fusix/**'
push: push:
tags: tags:
- 'v*' - 'v*'

@ -9,8 +9,6 @@ name: Build C# Tools
on: on:
pull_request: pull_request:
branches: [main, master] branches: [main, master]
paths:
- 'src-csharp/**'
push: push:
tags: tags:
- 'v*' - 'v*'

@ -7,9 +7,6 @@ name: Build MSI Check
on: on:
pull_request: pull_request:
branches: [main, master] branches: [main, master]
paths:
- 'msi/**'
- '.github/workflows/build-msi-check.yml'
workflow_dispatch: workflow_dispatch:
env: env:

@ -7,8 +7,6 @@
on: on:
pull_request: pull_request:
branches: [main, master] branches: [main, master]
paths:
- 'src-csharp/RDPOffsetFinder/**'
push: push:
tags: tags:
- 'v*' - 'v*'
@ -55,11 +53,13 @@ jobs:
/p:PlatformToolset=v143 ` /p:PlatformToolset=v143 `
/v:minimal /v:minimal
# Build the offset finder (links against the Zydis import lib just produced) # Build via .sln so $(SolutionDir) resolves to the submodule root where
# AdditionalIncludeDirectories and AdditionalDependencies reference zydis/
- name: Build RDPWrapOffsetFinder (${{ matrix.platform }}) - name: Build RDPWrapOffsetFinder (${{ matrix.platform }})
working-directory: src-csharp/RDPOffsetFinder working-directory: src-csharp/RDPOffsetFinder
run: | run: |
msbuild RDPWrapOffsetFinder\RDPWrapOffsetFinder.vcxproj ` msbuild RDPWrapOffsetFinder.sln `
/t:RDPWrapOffsetFinder `
/p:Configuration=Release ` /p:Configuration=Release `
/p:Platform="${{ matrix.platform }}" ` /p:Platform="${{ matrix.platform }}" `
/p:PlatformToolset=v143 ` /p:PlatformToolset=v143 `
@ -70,7 +70,8 @@ jobs:
run: | run: |
$arch = if ("${{ matrix.platform }}" -eq "Win32") { "x86" } else { "x64" } $arch = if ("${{ matrix.platform }}" -eq "Win32") { "x86" } else { "x64" }
$root = "src-csharp/RDPOffsetFinder" $root = "src-csharp/RDPOffsetFinder"
$exe = "$root/RDPWrapOffsetFinder/${{ matrix.finder_plat }}/Release/RDPWrapOffsetFinder.exe" # .sln build outputs to SolutionDir/<Platform>/Release/ (not <ProjectDir>/<Platform>/Release/)
$exe = "$root/${{ matrix.finder_plat }}/Release/RDPWrapOffsetFinder.exe"
$dll = "$root/zydis/msvc/bin/${{ matrix.zydis_bin }}/Zydis.dll" $dll = "$root/zydis/msvc/bin/${{ matrix.zydis_bin }}/Zydis.dll"
Write-Host "Exe: $(Get-Item $exe | Select-Object -Exp Length) bytes" Write-Host "Exe: $(Get-Item $exe | Select-Object -Exp Length) bytes"

Loading…
Cancel
Save