d6
/
xz-analysis-mirror
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Jia Tan 2023-07-28 21:56:48 +08:00
parent a048f472cd
commit 7190f4cc7c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/windows-ci.yml vendored
View File

@ -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 #