mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
Re-enabled MSYS2 build
This commit is contained in:
parent
2c58da535f
commit
e7a51c4e83
28
.github/workflows/build.yml
vendored
28
.github/workflows/build.yml
vendored
@ -126,10 +126,10 @@ jobs:
|
||||
runs-on: windows-latest
|
||||
strategy:
|
||||
matrix:
|
||||
target: ["msvc"] # Removing "msys2" from the target list
|
||||
target: ["msvc", "msys2"]
|
||||
defaults:
|
||||
run:
|
||||
shell: bash {0} #shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
|
||||
shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0}
|
||||
env:
|
||||
CCACHE_DIR: ${{ github.workspace }}/.ccache
|
||||
CCACHE_COMPILERCHECK: content
|
||||
@ -149,20 +149,20 @@ jobs:
|
||||
${{ runner.os }}-${{ matrix.target }}-
|
||||
- name: Set up MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
# if: ${{ matrix.target == 'msvc' }}
|
||||
if: ${{ matrix.target == 'msvc' }}
|
||||
- name: Install extra tools (MSVC)
|
||||
run: choco install ccache ninja wget
|
||||
# if: ${{ matrix.target == 'msvc' }}
|
||||
# - name: Set up MSYS2
|
||||
# uses: msys2/setup-msys2@v2
|
||||
# if: ${{ matrix.target == 'msys2' }}
|
||||
# with:
|
||||
# msystem: clang64
|
||||
# update: true
|
||||
# install: git make p7zip
|
||||
# pacboy: >-
|
||||
# toolchain:p ccache:p cmake:p ninja:p
|
||||
# qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
|
||||
if: ${{ matrix.target == 'msvc' }}
|
||||
- name: Set up MSYS2
|
||||
uses: msys2/setup-msys2@v2
|
||||
if: ${{ matrix.target == 'msys2' }}
|
||||
with:
|
||||
msystem: clang64
|
||||
update: true
|
||||
install: git make p7zip
|
||||
pacboy: >-
|
||||
toolchain:p ccache:p cmake:p ninja:p
|
||||
qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
|
||||
- name: Disable line ending translation
|
||||
run: git config --global core.autocrlf input
|
||||
- name: Build
|
||||
|
Loading…
Reference in New Issue
Block a user