From e7d7d0aee9cf482a9ca07e95e4de39ac2d500e96 Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Mon, 29 Apr 2024 10:13:21 -0600 Subject: [PATCH] CI: Enable FREECAD_COPY_LIBPACK_BIN_TO_BUILD to address Windows CI failures. --- .github/workflows/sub_buildWindows.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/sub_buildWindows.yml b/.github/workflows/sub_buildWindows.yml index 0daf76c58f..329e79896a 100644 --- a/.github/workflows/sub_buildWindows.yml +++ b/.github/workflows/sub_buildWindows.yml @@ -98,10 +98,6 @@ jobs: . $env:ccachebindir\ccache -s . $env:ccachebindir\ccache -z . $env:ccachebindir\ccache -p - - name: Append Libpack bin directory to Path - if: false # Disabled because not enough to set FREECAD_COPY_LIBPACK_BIN_TO_BUILD=OFF - run: | - echo "${{ env.libpackdir }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Configuring CMake run: > cmake -B"${{ env.builddir }}" . @@ -119,7 +115,7 @@ jobs: -DXercesC_LIBRARY_RELEASE="${{ env.libpackdir }}lib/xerces-c_3.lib" -DXercesC_LIBRARY_DEBUG="${{ env.libpackdir }}lib/xerces-c_3D.lib" -DFREECAD_COPY_DEPEND_DIRS_TO_BUILD=ON - -DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=OFF + -DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=ON -DFREECAD_COPY_PLUGINS_BIN_TO_BUILD=ON - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 @@ -130,9 +126,6 @@ jobs: - name: Print Ccache statistics after build run: | . $env:ccachebindir\ccache -s - - name: Move libpack bin folder to build folder # Shorter in time than copying with CMake FREECAD_COPY_LIBPACK_BIN_TO_BUILD - run: | - Move-Item -Force -Path ${{ env.libpackdir }}bin/* -Destination ${{ env.builddir }}/bin - name: C++ unit tests if: false # Disabled because seems to not function on Windows build timeout-minutes: 1