diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e689739f..f68a634e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,11 +58,16 @@ jobs: - name: Build shell: pwsh run: | + # Intentionally excluding some preinstalled components that conflict with our + # ancient build tooling and dependencies: Git (due to sh.exe), cmake, mingw64, OpenSSL + # # Include Ruby and Powershell for unit tests - # Intentionally excluding Git (due to conflicting sh.exe) and - # OpenSSL as previously we were linking against the wrong OpenSSL - # DLLs. - $env:PATH = "C:\tools\pl-build-tools\bin;C:\tools\mingw64\bin;C:\ProgramData\chocolatey\bin;C:\Program Files\dotnet;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\7-Zip;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Users\runneradmin\.dotnet\tools" + $oldpath = $env:PATH.Split(';') + $newpath = $oldpath | Where-Object { $_ -NotLike 'C:\Program Files\Git\*' -and $_ -NotLike 'C:\Program Files\CMake\*' -and $_ -NotLike 'C:\mingw64\*' -and $_ -NotLike 'C:\Program Files\OpenSSL\*' } + $diffpath = Compare-Object -ReferenceObject $oldpath -DifferenceObject $newpath -PassThru + Write-Output "Deleted: " $diffpath + $env:PATH = $newpath -Join ';' + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\cpp-pcp-client;C:\tools\cpp-hocon" -DCMAKE_INSTALL_PREFIX=C:\tools -DBOOST_STATIC=ON . mingw32-make install - name: Test