Fix the GHA msvc build
Use the 'ilammy/msvc-dev-cmd' action for setting up the msvc env, so we can use powershell everywhere. Remove a directory from PATH which was interfering with the meson build by providing an unrelated pkg-config.exe.
This commit is contained in:
parent
3a46ae5127
commit
93aea76a25
|
@ -14,11 +14,9 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- name: msvc-2017-x86
|
- name: msvc-2017-x86
|
||||||
os: windows-2016
|
os: windows-2016
|
||||||
VCVARSALLPATH: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
|
|
||||||
ARCH: x86
|
ARCH: x86
|
||||||
- name: msvc-2019-amd64
|
- name: msvc-2019-amd64
|
||||||
os: windows-latest
|
os: windows-latest
|
||||||
VCVARSALLPATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
|
|
||||||
ARCH: amd64
|
ARCH: amd64
|
||||||
name: ${{ matrix.name }}
|
name: ${{ matrix.name }}
|
||||||
|
|
||||||
|
@ -27,12 +25,26 @@ jobs:
|
||||||
- uses: actions/setup-python@v1
|
- uses: actions/setup-python@v1
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
- name: Build
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
shell: cmd
|
with:
|
||||||
|
arch : ${{ matrix.ARCH }}
|
||||||
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
pip install --upgrade meson ninja fonttools
|
pip install --upgrade meson ninja fonttools
|
||||||
"${{ matrix.VCVARSALLPATH }}" ${{ matrix.ARCH }} && meson setup build --wrap-mode=default --buildtype=release -Dglib=enabled -Dfreetype=enabled -Dgdi=enabled -Ddirectwrite=enabled && meson test --print-errorlogs --suite=harfbuzz -Cbuild
|
- name: Build
|
||||||
|
run: |
|
||||||
|
# This dir contains a pkg-config which meson will happily use and later fail, so remove it
|
||||||
|
$env:path = ($env:path.Split(';') | Where-Object { $_ -ne 'C:\Strawberry\perl\bin' }) -join ';'
|
||||||
|
|
||||||
|
meson setup build `
|
||||||
|
--wrap-mode=default `
|
||||||
|
--buildtype=release `
|
||||||
|
-Dglib=enabled `
|
||||||
|
-Dfreetype=enabled `
|
||||||
|
-Dgdi=enabled `
|
||||||
|
-Ddirectwrite=enabled
|
||||||
|
|
||||||
|
meson compile -C build
|
||||||
- name: Test
|
- name: Test
|
||||||
shell: cmd
|
|
||||||
run: |
|
run: |
|
||||||
meson test --print-errorlogs --suite=harfbuzz -C build
|
meson test --print-errorlogs --suite=harfbuzz -C build
|
||||||
|
|
Loading…
Reference in New Issue