From e149e60c7a760b1eda589ab468f5469a33e33592 Mon Sep 17 00:00:00 2001 From: Will Jordan Date: Fri, 12 Feb 2016 23:54:40 +0000 Subject: [PATCH 1/2] Use libvips-dev apk for alpine-linux packaging test --- packaging/test.sh | 2 +- packaging/test/alpine.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/test.sh b/packaging/test.sh index cb7dc531..e44a0360 100755 --- a/packaging/test.sh +++ b/packaging/test.sh @@ -51,7 +51,7 @@ fi # Alpine echo "Testing alpine..." -if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" wjordan/libvips >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test"; +if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" alpine:3.3 >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test"; then echo "alpine OK" else echo "alpine fail" && cat packaging/alpine.log fi diff --git a/packaging/test/alpine.sh b/packaging/test/alpine.sh index b14ed858..5a896fbc 100755 --- a/packaging/test/alpine.sh +++ b/packaging/test/alpine.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Install Node.js +# Install build dependencies apk add --update make gcc g++ python nodejs -# Install libvips dependencies -apk add --update glib-dev libpng libwebp libexif libxml2 orc fftw lcms2 +# Install libvips with build headers and dependencies +apk add libvips-dev --update --repository https://s3.amazonaws.com/wjordan-apk --allow-untrusted From 7b12f091e8a3841d941dfc07afc048be03e2c113 Mon Sep 17 00:00:00 2001 From: Will Jordan Date: Sat, 13 Feb 2016 13:48:46 -0500 Subject: [PATCH 2/2] use alpine:edge image for packaging test vips requires main/gettext-0.19.7r1 for aports commit 4ef70b432b05b720f7f144c2060550749d378205 to link correctly. --- packaging/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/test.sh b/packaging/test.sh index e44a0360..ef021366 100755 --- a/packaging/test.sh +++ b/packaging/test.sh @@ -51,7 +51,7 @@ fi # Alpine echo "Testing alpine..." -if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" alpine:3.3 >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test"; +if docker run -i -t --rm -v $PWD:/v -e "SHARP_TEST_WITHOUT_CACHE=0" alpine:edge >packaging/alpine.log 2>&1 sh -c "cd /v; ./packaging/test/alpine.sh; $test"; then echo "alpine OK" else echo "alpine fail" && cat packaging/alpine.log fi