Merge pull request #330 from DioEgizio/notportable
bring back not portable windows builds
This commit is contained in:
commit
c7fdfb8116
25
.github/workflows/build.yml
vendored
25
.github/workflows/build.yml
vendored
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user