diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-03-22 16:42:40 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-03-22 20:11:15 +0100 |
| commit | 6025cd0ca5d55f58bf1079bfe87c77d7afdc34e0 (patch) | |
| tree | cc68c50b97702704173425df172b011548fe12e2 | |
| parent | ce05ce92bb7f772963526c60e47382579728344b (diff) | |
| download | PrismLauncher-6025cd0ca5d55f58bf1079bfe87c77d7afdc34e0.tar.gz PrismLauncher-6025cd0ca5d55f58bf1079bfe87c77d7afdc34e0.tar.bz2 PrismLauncher-6025cd0ca5d55f58bf1079bfe87c77d7afdc34e0.zip | |
Merge pull request #330 from DioEgizio/notportable
bring back not portable windows builds
| -rw-r--r-- | .github/workflows/build.yml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac181079..4aa316f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,22 @@ jobs: - os: windows-2022 name: "Windows-i686" msystem: mingw32 + portable: false - os: windows-2022 name: "Windows-x86_64" msystem: mingw64 + portable: false + + - os: windows-2022 + name: "Windows-i686-portable" + msystem: mingw32 + portable: true + + - os: windows-2022 + name: "Windows-x86_64-portable" + msystem: mingw64 + portable: true - os: macos-11 qt_version: 5.12.12 @@ -122,11 +134,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 }} -DLauncher_PORTABLE=OFF -G Ninja + + + - 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' |