Skip to content

Commit 0292910

Browse files
committed
move MSYS2 to GHA
1 parent 7fb21bc commit 0292910

2 files changed

Lines changed: 52 additions & 21 deletions

File tree

.appveyor.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ environment:
1717
- PYTHON: C:/Python38-x64
1818
- PYTHON: C:/Python35
1919
- PYTHON: C:/Python35-x64
20-
- PYTHON: C:/msys64/mingw32
21-
EXECUTABLE: bin/python3
22-
PIP_DIR: bin
23-
TEST_OPTIONS: --processes=0
24-
DEPLOY: NO
2520
- PYTHON: C:/vp/pypy3
2621
EXECUTABLE: bin/pypy.exe
2722
VENV: YES
@@ -41,33 +36,17 @@ install:
4136
c:\pillow\winbuild\appveyor_install_pypy3.cmd
4237
}
4338
- ps: |
44-
if ($env:PYTHON -eq "c:/msys64/mingw32")
45-
{
46-
c:\msys64\usr\bin\bash -l -c c:\\pillow\\winbuild\\appveyor_install_msys2_deps.sh
47-
}
48-
else
49-
{
5039
c:\python37\python.exe c:\pillow\winbuild\build_dep.py
5140
c:\pillow\winbuild\build_deps.cmd
5241
$host.SetShouldExit(0)
53-
}
5442
- curl -fsSL -o gs952.exe https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/gs952w32.exe
5543
- gs952.exe /S
5644
- path %path%;C:\Program Files (x86)\gs\gs9.52\bin
5745

5846
build_script:
5947
- ps: |
60-
if ($env:PYTHON -eq "c:/msys64/mingw32")
61-
{
62-
c:\msys64\usr\bin\bash -l -c c:\\pillow\\winbuild\\appveyor_build_msys2.sh
63-
Write-Host "through install"
64-
$host.SetShouldExit(0)
65-
}
66-
else
67-
{
6848
& $env:PYTHON/$env:EXECUTABLE c:\pillow\winbuild\build.py
6949
$host.SetShouldExit(0)
70-
}
7150
- cd c:\pillow
7251
- '%PYTHON%\%EXECUTABLE% selftest.py --installed'
7352

.github/workflows/test-windows.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,3 +385,55 @@ jobs:
385385
with:
386386
name: ${{ steps.wheel.outputs.dist }}
387387
path: dist
388+
389+
msys:
390+
runs-on: windows-2019
391+
392+
strategy:
393+
fail-fast: false
394+
matrix:
395+
mingw: ["MINGW32", "MINGW64"]
396+
include:
397+
- mingw: "MINGW32"
398+
package: "mingw-w64-i686"
399+
- mingw: "MINGW64"
400+
package: "mingw-w64-x86_64"
401+
402+
defaults:
403+
run:
404+
shell: bash.exe --login "{0}"
405+
env:
406+
MSYSTEM: ${{ matrix.mingw }}
407+
CHERE_INVOKING: 1
408+
409+
timeout-minutes: 30
410+
name: MSYS2 ${{ matrix.mingw }}
411+
412+
steps:
413+
- uses: actions/checkout@v2
414+
415+
- name: Set up MSYS
416+
run: echo ::add-path::C:\msys64\usr\bin\
417+
shell: pwsh
418+
419+
- name: Install MinGW packages
420+
run: |
421+
pacman -S --noconfirm \
422+
${{ matrix.package }}-python3-pip \
423+
${{ matrix.package }}-python3-setuptools \
424+
${{ matrix.package }}-python3-pytest \
425+
${{ matrix.package }}-python3-pytest-cov \
426+
${{ matrix.package }}-python3-olefile \
427+
${{ matrix.package }}-libjpeg-turbo \
428+
${{ matrix.package }}-libimagequant
429+
python3 -m pip install -U pip codecov
430+
431+
- name: Build Pillow
432+
run: |
433+
python3 setup.py install
434+
435+
- name: Test Pillow
436+
run: |
437+
python3 selftest.py --installed
438+
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
439+
codecov --file coverage.xml --name MSYS2 ${{ matrix.mingw }}

0 commit comments

Comments
 (0)