mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 02:30:12 +02:00
Ensure Windows CI uses x64
This commit is contained in:
parent
2129adfcc3
commit
f4cbbd7b79
@ -3,6 +3,7 @@ node_js:
|
||||
- "0.10"
|
||||
- "0.12"
|
||||
- "4"
|
||||
- "5"
|
||||
sudo: false
|
||||
addons:
|
||||
apt:
|
||||
|
@ -7,8 +7,9 @@ environment:
|
||||
matrix:
|
||||
- nodejs_version: "0.12"
|
||||
- nodejs_version: "4"
|
||||
- nodejs_version: "5"
|
||||
install:
|
||||
- ps: Install-Product node $env:nodejs_version x86
|
||||
- npm install --arch=ia32
|
||||
- ps: Install-Product node $env:nodejs_version x64
|
||||
- npm install
|
||||
test_script:
|
||||
- npm run-script test-win32
|
||||
- npm run-script test-win
|
||||
|
@ -65,8 +65,8 @@
|
||||
},
|
||||
'libraries': [
|
||||
'<(module_root_dir)/lib/libvips.lib',
|
||||
'<(module_root_dir)/lib/glib-2.0.lib',
|
||||
'<(module_root_dir)/lib/gobject-2.0.lib'
|
||||
'<(module_root_dir)/lib/libglib-2.0.lib',
|
||||
'<(module_root_dir)/lib/libgobject-2.0.lib'
|
||||
]
|
||||
}],
|
||||
['OS == "linux"', {
|
||||
|
@ -25,7 +25,7 @@
|
||||
"test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=20000 ./test/unit/*.js",
|
||||
"test-clean": "npm run clean && npm install && npm test",
|
||||
"test-leak": "./test/leak/leak.sh",
|
||||
"test-win32": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=30000 ./test/unit/*.js"
|
||||
"test-win": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=30000 ./test/unit/*.js"
|
||||
},
|
||||
"main": "index.js",
|
||||
"repository": {
|
||||
|
@ -13,4 +13,4 @@ RUN unzip vips-dev-w64-8.1.1-2.zip
|
||||
WORKDIR /vips/vips-dev-8.1.1
|
||||
RUN rm bin/libvipsCC-42.dll bin/libvips-cpp-42.dll
|
||||
RUN cp bin/*.dll lib/
|
||||
RUN GZIP=-9 tar czf /libvips-8.1.1-win.tar.gz include lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll
|
||||
RUN GZIP=-9 tar czf /libvips-8.1.1-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll
|
||||
|
@ -11,10 +11,6 @@
|
||||
#error libvips version 7.40.0+ required - see http://sharp.dimens.io/page/install
|
||||
#endif
|
||||
|
||||
#ifdef _WIN64
|
||||
#error Windows 64-bit is currently unsupported - see http://sharp.dimens.io/page/install#windows
|
||||
#endif
|
||||
|
||||
#if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
|
||||
#error GCC version 4.6+ is required for C++11 features - see http://sharp.dimens.io/page/install#prerequisites
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user