From 037766fdc40731232a5a79efc9c94e296356d195 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst Date: Fri, 1 Mar 2019 16:30:22 +0000 Subject: [PATCH] CI: fix release builds For some reason running "go mod vendor" edited the sum file. Lets make sure there are no more surprises by running it in CI as well. --- .circleci/Dockerfile | 5 ----- .circleci/config.yml | 8 +++++--- go.sum | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 9285342ec0f..808ddbd5fcb 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -26,11 +26,6 @@ RUN apt-get install -y wget bzip2 && \ wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash && \ apt-get remove -y wget -# Install dep -RUN apt-get install -y wget && \ - wget -qO- https://raw.githubusercontent.com/golang/dep/master/install.sh | sh && \ - apt-get remove -y wget - # Clean up RUN apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* diff --git a/.circleci/config.yml b/.circleci/config.yml index cac9aa698e0..92905b40ab7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,6 +39,7 @@ jobs: - run: make realclean - run: make examples SWAGGER_CODEGEN="${SWAGGER_CODEGEN}" # Set in Docker image - run: go mod tidy + - run: go mod vendor - run: git diff --exit-code lint: docker: @@ -95,6 +96,7 @@ workflows: - release: filters: branches: - ignore: /.*/ - tags: - only: /v[0-9]+(\.[0-9]+)*(-.*)*/ + #ignore: /.*/ + only: fix-release-builds + #tags: + #only: /v[0-9]+(\.[0-9]+)*(-.*)*/ diff --git a/go.sum b/go.sum index 78191e96227..7e37954c401 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,7 @@ google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/resty.v1 v1.9.0 h1:mCx5NxFISl+YcVKcz4u69YktLtuKwRAhdL2ByPlFIbg= gopkg.in/resty.v1 v1.9.0/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 h1:+t9dhfO+GNOIGJof6kPOAenx7YgrZMTdRPV+EsnPabk= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=