mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-27 02:16:19 +03:00
use gs binary on gha
This commit is contained in:
parent
2d11929333
commit
3c1f90efce
27
.github/workflows/test-windows.yml
vendored
27
.github/workflows/test-windows.yml
vendored
|
@ -68,6 +68,12 @@ jobs:
|
||||||
Write-Host "`#`#[add-path]$env:RUNNER_WORKSPACE\nasm-2.14.02"
|
Write-Host "`#`#[add-path]$env:RUNNER_WORKSPACE\nasm-2.14.02"
|
||||||
Write-Host "::add-path::$env:RUNNER_WORKSPACE\nasm-2.14.02"
|
Write-Host "::add-path::$env:RUNNER_WORKSPACE\nasm-2.14.02"
|
||||||
|
|
||||||
|
# 32-bit should work on both platforms
|
||||||
|
curl -fsSL -o gs950.exe https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/gs950w32.exe
|
||||||
|
./gs950.exe /S
|
||||||
|
Write-Host "`#`#[add-path]C:\Program Files (x86)\gs\gs9.50\bin"
|
||||||
|
Write-Host "::add-path::C:\Program Files (x86)\gs\gs9.50\bin"
|
||||||
|
|
||||||
$env:PYTHON=$env:pythonLocation
|
$env:PYTHON=$env:pythonLocation
|
||||||
curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip
|
curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/master.zip
|
||||||
7z x pillow-depends.zip -oc:\
|
7z x pillow-depends.zip -oc:\
|
||||||
|
@ -308,23 +314,6 @@ jobs:
|
||||||
copy /Y /B libraqm.dll %INCLIB%
|
copy /Y /B libraqm.dll %INCLIB%
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
- name: Build dependencies / ghostscript
|
|
||||||
if: false
|
|
||||||
run: |
|
|
||||||
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
|
|
||||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
|
||||||
set BUILD=%GITHUB_WORKSPACE%\winbuild\build
|
|
||||||
cd /D %BUILD%\ghostscript-9.27
|
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
|
|
||||||
echo on
|
|
||||||
set MSVC_VERSION=14
|
|
||||||
set RCOMP="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\RC.Exe"
|
|
||||||
if "${{ matrix.architecture }}"=="x64" set WIN64=""
|
|
||||||
nmake -nologo -f psi\msvc.mak
|
|
||||||
rem Add bin to PATH variable: Copy to INCLIB, then add INCLIB to PATH in Test step.
|
|
||||||
copy /Y /B bin\* %INCLIB%
|
|
||||||
shell: cmd
|
|
||||||
|
|
||||||
- name: Build Pillow
|
- name: Build Pillow
|
||||||
run: |
|
run: |
|
||||||
set PYTHON=%pythonLocation%
|
set PYTHON=%pythonLocation%
|
||||||
|
@ -338,7 +327,7 @@ jobs:
|
||||||
set DISTUTILS_USE_SDK=1
|
set DISTUTILS_USE_SDK=1
|
||||||
set py_vcruntime_redist=true
|
set py_vcruntime_redist=true
|
||||||
%PYTHON%\python.exe setup.py build_ext install
|
%PYTHON%\python.exe setup.py build_ext install
|
||||||
rem Add GhostScript and Raqm binaries (copied to INCLIB) to PATH.
|
rem Add libraqm.dll (copied to INCLIB) to PATH.
|
||||||
path %INCLIB%;%PATH%
|
path %INCLIB%;%PATH%
|
||||||
%PYTHON%\python.exe selftest.py --installed
|
%PYTHON%\python.exe selftest.py --installed
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
@ -354,7 +343,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
set PYTHON=%pythonLocation%
|
set PYTHON=%pythonLocation%
|
||||||
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
|
||||||
rem Add GhostScript and Raqm binaries (copied to INCLIB) to PATH.
|
rem Add libraqm.dll (copied to INCLIB) to PATH.
|
||||||
path %INCLIB%;%PATH%
|
path %INCLIB%;%PATH%
|
||||||
cd /D %GITHUB_WORKSPACE%
|
cd /D %GITHUB_WORKSPACE%
|
||||||
%PYTHON%\python.exe -m pytest -vx --cov PIL --cov-report term --cov-report xml Tests
|
%PYTHON%\python.exe -m pytest -vx --cov PIL --cov-report term --cov-report xml Tests
|
||||||
|
|
Loading…
Reference in New Issue
Block a user