[CI] Unify cmake build/install commands for Windows and Linux

opendocument-app · Sep 1, 2024 · c975dd9 · c975dd9
1 parent b9f8e02
commit c975dd9
Showing 1 changed file with 2 additions and 22 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -72,12 +72,6 @@ jobs:
           -DCMAKE_CXX_FLAGS="-Werror"
           -DCMAKE_INSTALL_PREFIX=install
           -DODR_TEST=ON
-      - name: build
-        if: runner.os != 'Windows'
-        run: cmake --build build
-      - name: install
-        if: runner.os != 'Windows'
-        run: cmake --build build --target install
 
       - name: cmake
         if: runner.os == 'Windows'
@@ -88,13 +82,11 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_INSTALL_PREFIX=install
           -DODR_TEST=ON
+
       - name: build
-        if: runner.os == 'Windows'
-        # `config Release` somehow necessary for windows
         run: cmake --build build --config Release
+
       - name: install
-        if: runner.os == 'Windows'
-        # `config Release` somehow necessary for windows
         run: cmake --build build --target install --config Release
 
       - name: upload binaries to github
@@ -290,24 +282,12 @@ jobs:
         run: conan install test/downstream --output-folder=test/downstream/build --build=missing
 
       - name: cmake
-        if: runner.os != 'Windows'
         run: >
           cmake -S test/downstream -B test/downstream/build
           -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"
           -DCMAKE_BUILD_TYPE=Release
-      - name: build
-        if: runner.os != 'Windows'
-        run: cmake --build test/downstream/build
 
-      - name: cmake
-        if: runner.os == 'Windows'
-        run: >
-          cmake -S test/downstream -B test/downstream/build
-          -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake"
-          -DCMAKE_BUILD_TYPE=Release
       - name: build
-        if: runner.os == 'Windows'
-        # `config Release` somehow necessary for windows
         run: cmake --build test/downstream/build --config Release
 
       - name: run