LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

During windows CI builds, use a specific Pillow

Browse Source 
This is because we build against a fixed PIL_INCLUDE_DIR whos version
needs to match the python version we install

Note: CI builds for windows use a hard-coded path for PIL.  I manually
updated this to version 5.1.0

TODO@achin: automatically download the right version of pillow src
This commit is contained in:
Andrew Chin
2018-04-21 15:18:59 -04:00
parent cd11ea31a9
commit 44b525e709
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -36,9 +36,9 @@ build:windows:
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- set DISTUTILS_USE_SDK=1 - set DISTUTILS_USE_SDK=1
- set MSSdk=1 - set MSSdk=1
- set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging
- c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env - c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env
- ci_env\scripts\pip.exe install numpy Pillow - ci_env\scripts\pip.exe install numpy Pillow==5.1.0
- ci_env\Scripts\python.exe setup.py build - ci_env\Scripts\python.exe setup.py build
- ci_env\Scripts\python.exe overviewer.py --verbose --version - ci_env\Scripts\python.exe overviewer.py --verbose --version
@@ -223,9 +223,9 @@ package:win64:
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
- set DISTUTILS_USE_SDK=1 - set DISTUTILS_USE_SDK=1
- set MSSdk=1 - set MSSdk=1
- set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging
- c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env - c:\Python27\python.exe c:\devel\virtualenv\virtualenv.py ci_env
- ci_env\scripts\pip.exe install numpy Pillow pyinstaller sphinx - ci_env\scripts\pip.exe install numpy Pillow==5.10 pyinstaller sphinx
- ci_env\Scripts\python.exe setup.py build - ci_env\Scripts\python.exe setup.py build
- copy build-tools\overviewer.spec . - copy build-tools\overviewer.spec .
- ci_env\Scripts\pyinstaller.exe overviewer.spec - ci_env\Scripts\pyinstaller.exe overviewer.spec
@@ -247,9 +247,9 @@ package:win32:
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- set DISTUTILS_USE_SDK=1 - set DISTUTILS_USE_SDK=1
- set MSSdk=1 - set MSSdk=1
- set PIL_INCLUDE_DIR=c:\devel\pillow\libImaging - set PIL_INCLUDE_DIR=c:\devel\pillow\src\libImaging
- "\"c:\\Python27 (x86)\\python.exe\" c:\\devel\\virtualenv\\virtualenv.py ci_env" - "\"c:\\Python27 (x86)\\python.exe\" c:\\devel\\virtualenv\\virtualenv.py ci_env"
- ci_env\scripts\pip.exe install numpy Pillow pyinstaller sphinx - ci_env\scripts\pip.exe install numpy Pillow==5.1.0 pyinstaller sphinx
- ci_env\Scripts\python.exe setup.py build - ci_env\Scripts\python.exe setup.py build
- copy build-tools\overviewer.spec . - copy build-tools\overviewer.spec .
- ci_env\Scripts\pyinstaller.exe overviewer.spec - ci_env\Scripts\pyinstaller.exe overviewer.spec