Skip to content

Commit

Permalink
Merge pull request PolyMC#330 from DioEgizio/notportable
Browse files Browse the repository at this point in the history
bring back not portable windows builds
  • Loading branch information
Scrumplex authored Mar 22, 2022
2 parents 64399dd + c6b1a77 commit c7fdfb8
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit c7fdfb8

Please sign in to comment.