mirror of https://git.tukaani.org/xz.git
CI: Fix windows-ci dependency installation.
All of the MSYS2 environments need make, and it does not come with the toolchain package. The toolchain package will install the needed compiler toolchains since without this package CMake cannot properly generate the Makefiles.
This commit is contained in:
parent
a048f472cd
commit
7190f4cc7c
|
@ -42,7 +42,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
msystem: ${{ matrix.msys2_env }}
|
msystem: ${{ matrix.msys2_env }}
|
||||||
update: true
|
update: true
|
||||||
install: pactoys
|
install: pactoys make
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
# Need to explicitly set the shell here since we set the default
|
# Need to explicitly set the shell here since we set the default
|
||||||
|
@ -71,7 +71,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
if: ${{ matrix.msys2_env != 'msys' && matrix.build_system == 'autotools' }}
|
if: ${{ matrix.msys2_env != 'msys' && matrix.build_system == 'autotools' }}
|
||||||
run: pacboy --noconfirm -S --needed autotools:p gcc:p clang:p make:p doxygen:p
|
run: pacboy --noconfirm -S --needed autotools:p toolchain:p doxygen:p
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
if: ${{ matrix.msys2_env == 'msys' && matrix.build_system == 'cmake' }}
|
if: ${{ matrix.msys2_env == 'msys' && matrix.build_system == 'cmake' }}
|
||||||
|
@ -79,7 +79,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
if: ${{ matrix.msys2_env != 'msys' && matrix.build_system == 'cmake' }}
|
if: ${{ matrix.msys2_env != 'msys' && matrix.build_system == 'cmake' }}
|
||||||
run: pacboy --noconfirm -S --needed cmake:p gcc:p clang:p make:p
|
run: pacboy --noconfirm -S --needed cmake:p toolchain:p
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# Build and Test #
|
# Build and Test #
|
||||||
|
|
Loading…
Reference in New Issue