diff options
| -rw-r--r-- | .github/workflows/build.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0a57c41..5fb98faa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,11 +135,18 @@ jobs: run: | cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja - - name: Configure CMake on Windows - if: runner.os == 'Windows' + - name: Configure CMake on Windows + if: runner.os == 'Windows' && matrix.portable != true shell: msys2 {0} run: | - cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja -DLauncher_PORTABLE=OFF + + + - name: Configure CMake on Windows portable + if: runner.os == 'Windows' && matrix.portable == true + shell: msys2 {0} + run: | + cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -G Ninja - name: Configure CMake on Linux if: runner.os == 'Linux' @@ -151,17 +158,11 @@ jobs: run: | cmake --build ${{ env.BUILD_DIR }} - - name: Build on Windows portable - if: runner.os == 'Windows' && matrix.portable == true + - name: Build on Windows + if: runner.os == 'Windows' shell: msys2 {0} run: | cmake --build ${{ env.BUILD_DIR }} - - - name: Build on Windows - if: runner.os == 'Windows' && matrix.portable != true - shell: msys2 {0} - run: | - cmake --build ${{ env.BUILD_DIR }} -DLauncher_PORTABLE=OFF - name: Install if: runner.os != 'Linux' && runner.os != 'Windows' |