From 94ad82abd06e8af72d41892f8bbee6b642f46ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Mit=C3=A1=C5=A1?= Date: Sat, 3 Feb 2024 23:16:48 +0100 Subject: [PATCH] CI: Rework Windows build jobs to use nmake rather than Visual Studio solution. --- .github/workflows/ci-build.yml | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 51111d34..20da207f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -43,26 +43,32 @@ jobs: # Windows builds. # - # We build 32-bit Release and 64-bit Debug build (complete matrix would - # likely be an overkill). - # - # FIXME: If possible we should also run our tests on Windows. + # We do both 32 and 64-bit builds. Also note 32-bit does Debug build while + # 64-bit one does Release build. (Full matrix would likely be an overkill.) windows-32-debug: runs-on: windows-latest steps: - - uses: actions/checkout@v4 - - uses: microsoft/setup-msbuild@v1.3.1 + - name: Checkout + uses: actions/checkout@v4 + - name: Dev command prompt + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x86 - name: Configure - run: cmake -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 17 2022" -A Win32 . + run: cmake -DCMAKE_BUILD_TYPE=Debug -G "NMake Makefiles" . - name: Build - run: msbuild.exe md4c.sln /p:Configuration=Release /p:Platform=Win32 + run: nmake windows-64-release: runs-on: windows-latest steps: - - uses: actions/checkout@v4 - - uses: microsoft/setup-msbuild@v1.3.1 + - name: Checkout + uses: actions/checkout@v4 + - name: Dev command prompt + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x64 - name: Configure - run: cmake -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 17 2022" -A x64 . + run: cmake -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" . - name: Build - run: msbuild.exe md4c.sln /p:Configuration=Debug /p:Platform=x64 + run: nmake