From 8a161e4f54f2c012e21e36294fc509e6f15c50ee Mon Sep 17 00:00:00 2001 From: swirl Date: Wed, 29 Nov 2023 20:15:42 -0500 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 467cca11..9f1dd220 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,9 +181,9 @@ jobs: git apply ../.github/patches/No-Werror.patch cd .. - - name: Configure CMake - Windows + - name: Build ntcore - Windows run: | - cmake -S . -B winbuild \ + cmake -S allwpilib -B win-nt-build \ -G "Ninja" \ -DCMAKE_C_COMPILER_LAUNCHER=sccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \ @@ -206,6 +206,8 @@ jobs: -DVCPKG_HOST_TRIPLET=x64-windows-release \ -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \ -DENABLE_LTO=ON + cmake -B win-nt-build --parallel $(nproc) + cmake --install win-nt-build --prefix install --component portable env: SCCACHE_GHA_ENABLED: "true" @@ -217,5 +219,4 @@ jobs: - name: Package (Windows) run: | - cmake --install ${{ env.BUILD_DIR }} - cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_DIR }} --component portable + cmake --install winbuild --prefix install --component portable