From b81505ec21efc39203056ed0818851a5b9b930ed Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 21 Sep 2018 11:09:46 +0300 Subject: [PATCH] Update build files --- .travis.yml | 7 +------ Dockerfile | 11 ++--------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28b34c1..90862fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,7 @@ sudo: false dist: trusty go: - - "1.9.x" - - "1.10.x" + - "1.11.x" - master before_script: make prepare @@ -17,10 +16,6 @@ script: - make critic - make test -cache: - directories: - - vendor - matrix: allow_failures: - go: master diff --git a/Dockerfile b/Dockerfile index c888b93..6c3e2e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ############################################################################### # BUILD STAGE -FROM golang:1.10-alpine +FROM golang:1.11-alpine RUN set -x \ && apk --no-cache --update add \ @@ -13,14 +13,7 @@ RUN set -x \ upx \ && update-ca-certificates -COPY Gopkg.toml Gopkg.lock Makefile /go/src/github.com/9seconds/mtg/ - -RUN set -x && \ - cd /go/src/github.com/9seconds/mtg && \ - make -j 4 prepare && \ - make vendor - -COPY . /go/src/github.com/9seconds/mtg +COPY . /go/src/github.com/9seconds/mtg/ RUN set -x \ && cd /go/src/github.com/9seconds/mtg \