Skip to content

Commit d7798fb

Browse files
radarhereradarhere
authored
Merge pull request #5709 from hugovk/update-ci
CI: Split MINGW to own workflow, remove redundant job
2 parents cf6b101 + a761d9b commit d7798fb

File tree

4 files changed

+87
-81
lines changed

4 files changed

+87
-81
lines changed

‎.github/mergify.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pull_request_rules:
77
- status-success=Test Successful
88
- status-success=Docker Test Successful
99
- status-success=Windows Test Successful
10+
- status-success=MinGW Test Successful
1011
- status-success=continuous-integration/appveyor/pr
1112
actions:
1213
merge:

‎.github/workflows/test-mingw.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Test MinGW
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: windows-2019
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
mingw: ["MINGW32", "MINGW64"]
12+
include:
13+
- mingw: "MINGW32"
14+
name: "MSYS2 MinGW 32-bit"
15+
package: "mingw-w64-i686"
16+
- mingw: "MINGW64"
17+
name: "MSYS2 MinGW 64-bit"
18+
package: "mingw-w64-x86_64"
19+
20+
defaults:
21+
run:
22+
shell: bash.exe --login -eo pipefail "{0}"
23+
env:
24+
MSYSTEM: ${{ matrix.mingw }}
25+
CHERE_INVOKING: 1
26+
27+
timeout-minutes: 30
28+
name: ${{ matrix.name }}
29+
30+
steps:
31+
- name: Checkout Pillow
32+
uses: actions/checkout@v2
33+
34+
- name: Set up shell
35+
run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
36+
shell: pwsh
37+
38+
- name: Install dependencies
39+
run: |
40+
pacman -S --noconfirm \
41+
${{ matrix.package }}-python3-cffi \
42+
${{ matrix.package }}-python3-numpy \
43+
${{ matrix.package }}-python3-olefile \
44+
${{ matrix.package }}-python3-pip \
45+
${{ matrix.package }}-python3-pyqt5 \
46+
${{ matrix.package }}-python3-setuptools \
47+
${{ matrix.package }}-freetype \
48+
${{ matrix.package }}-ghostscript \
49+
${{ matrix.package }}-lcms2 \
50+
${{ matrix.package }}-libimagequant \
51+
${{ matrix.package }}-libjpeg-turbo \
52+
${{ matrix.package }}-libraqm \
53+
${{ matrix.package }}-libtiff \
54+
${{ matrix.package }}-libwebp \
55+
${{ matrix.package }}-openjpeg2 \
56+
subversion
57+
58+
python3 -m pip install pyroma pytest pytest-cov
59+
60+
pushd depends && ./install_extra_test_images.sh && popd
61+
62+
- name: Build Pillow
63+
run: CFLAGS="-coverage" python3 setup.py build_ext install
64+
65+
- name: Test Pillow
66+
run: |
67+
python3 selftest.py --installed
68+
python3 -c "from PIL import Image"
69+
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
70+
71+
- name: Upload coverage
72+
run: |
73+
python3 -m pip install codecov
74+
bash <(curl -s https://codecov.io/bash) -F GHA_Windows
75+
env:
76+
CODECOV_NAME: ${{ matrix.name }}
77+
78+
success:
79+
needs: build
80+
runs-on: ubuntu-latest
81+
name: MinGW Test Successful
82+
steps:
83+
- name: Success
84+
run: echo MinGW Test Successful

‎.github/workflows/test-valgrind.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,3 @@ jobs:
4242
sudo chown -R 1000 $GITHUB_WORKSPACE
4343
docker run --name pillow_container -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
4444
sudo chown -R runner $GITHUB_WORKSPACE
45-
46-
success:
47-
needs: build
48-
runs-on: ubuntu-latest
49-
name: Valgrind Test Successful
50-
steps:
51-
- name: Success
52-
run: echo Valgrind Test Successful

‎.github/workflows/test-windows.yml‎

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
# PyPy 7.3.4+ only ships 64-bit binaries for Windows
1818
- python-version: "pypy-3.7"
1919
architecture: "x64"
20+
2021
timeout-minutes: 30
2122

2223
name: Python ${{ matrix.python-version }} ${{ matrix.architecture }}
@@ -195,80 +196,8 @@ jobs:
195196
name: ${{ steps.wheel.outputs.dist }}
196197
path: dist\*.whl
197198

198-
msys:
199-
runs-on: windows-2019
200-
201-
strategy:
202-
fail-fast: false
203-
matrix:
204-
mingw: ["MINGW32", "MINGW64"]
205-
include:
206-
- mingw: "MINGW32"
207-
name: "MSYS2 MinGW 32-bit"
208-
package: "mingw-w64-i686"
209-
- mingw: "MINGW64"
210-
name: "MSYS2 MinGW 64-bit"
211-
package: "mingw-w64-x86_64"
212-
213-
defaults:
214-
run:
215-
shell: bash.exe --login -eo pipefail "{0}"
216-
env:
217-
MSYSTEM: ${{ matrix.mingw }}
218-
CHERE_INVOKING: 1
219-
220-
timeout-minutes: 30
221-
name: ${{ matrix.name }}
222-
223-
steps:
224-
- uses: actions/checkout@v2
225-
226-
- name: Set up shell
227-
run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
228-
shell: pwsh
229-
230-
- name: Install Dependencies
231-
run: |
232-
pacman -S --noconfirm \
233-
${{ matrix.package }}-python3-cffi \
234-
${{ matrix.package }}-python3-numpy \
235-
${{ matrix.package }}-python3-olefile \
236-
${{ matrix.package }}-python3-pip \
237-
${{ matrix.package }}-python3-pyqt5 \
238-
${{ matrix.package }}-python3-setuptools \
239-
${{ matrix.package }}-freetype \
240-
${{ matrix.package }}-ghostscript \
241-
${{ matrix.package }}-lcms2 \
242-
${{ matrix.package }}-libimagequant \
243-
${{ matrix.package }}-libjpeg-turbo \
244-
${{ matrix.package }}-libraqm \
245-
${{ matrix.package }}-libtiff \
246-
${{ matrix.package }}-libwebp \
247-
${{ matrix.package }}-openjpeg2 \
248-
subversion
249-
250-
python3 -m pip install pyroma pytest pytest-cov
251-
252-
pushd depends && ./install_extra_test_images.sh && popd
253-
254-
- name: Build Pillow
255-
run: CFLAGS="-coverage" python3 setup.py build_ext install
256-
257-
- name: Test Pillow
258-
run: |
259-
python3 selftest.py --installed
260-
python3 -c "from PIL import Image"
261-
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
262-
263-
- name: Upload coverage
264-
run: |
265-
python3 -m pip install codecov
266-
bash <(curl -s https://codecov.io/bash) -F GHA_Windows
267-
env:
268-
CODECOV_NAME: ${{ matrix.name }}
269-
270199
success:
271-
needs: [build, msys]
200+
needs: build
272201
runs-on: ubuntu-latest
273202
name: Windows Test Successful
274203
steps:

0 commit comments

Comments
 (0)