diff --git a/.travis.yml b/.travis.yml index d381c50..e29a2da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,14 @@ services: - docker env: - - LIBVIPS=7.42.3 - - LIBVIPS=8.4.6 - - LIBVIPS=8.5.8 - - LIBVIPS=8.6.2 - - LIBVIPS=8.7.4 - - LIBVIPS=8.8.4 + # - LIBVIPS=7.42.3 + # - LIBVIPS=8.4.6 + # - LIBVIPS=8.5.8 + # - LIBVIPS=8.6.2 + # - LIBVIPS=8.7.4 + # - LIBVIPS=8.8.4 - LIBVIPS=8.9.2 - - LIBVIPS=master + # - LIBVIPS=master matrix: allow_failures: @@ -27,11 +27,9 @@ cache: directories: - $HOME/libvips -before_install: - - docker build -t bimg:testing --build-arg LIBVIPS_VERSION=$LIBVIPS . - script: - - docker run bimg:testing sh -c 'export LD_LIBRARY_PATH=/vips/lib:$LD_LIBRARY_PATH; export PKG_CONFIG_PATH=/vips/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig; go vet . && golint . && go test -v -race -covermode=atomic -coverprofile=coverage.out' + - docker build -t h2non/bimg:ci --build-arg LIBVIPS_VERSION=$LIBVIPS . + - docker run h2non/bimg:ci sh -c 'export LD_LIBRARY_PATH=/vips/lib:$LD_LIBRARY_PATH; export PKG_CONFIG_PATH=/vips/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig; go vet . && golint . && go test -v -race -covermode=atomic -coverprofile=coverage.out' # - diff -u <(echo -n) <(gofmt -s -d ./) # - diff -u <(echo -n) <(go vet ./) # - diff -u <(echo -n) <(golint ./) diff --git a/Dockerfile b/Dockerfile index 9e0c686..7db4613 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,8 +48,8 @@ RUN DEBIAN_FRONTEND=noninteractive \ # Install Go lint RUN go get -u golang.org/x/lint/golint -ENV LD_LIBRARY_PATH="/vips/lib:$LD_LIBRARY_PATH" -ENV PKG_CONFIG_PATH="/vips/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig" +# ENV LD_LIBRARY_PATH="/vips/lib:$LD_LIBRARY_PATH" +# ENV PKG_CONFIG_PATH="/vips/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig" WORKDIR ${GOPATH}/src/github.com/h2non/bimg COPY . .