travis should work with go modules

rewantsoni · Dec 1, 2019 · ce79073 · ce79073
1 parent ff96602
commit ce79073
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,15 +19,15 @@ jobs:
   include:
     - stage: test
       script:
-        - make setup/dep setup/travis code/check test/unit
+        - make setup/travis code/check test/unit
     - stage: compile
       script:
-        - make setup/dep setup/travis image/build TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
+        - make setup/travis image/build TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
     - stage: push
       script:
         - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
         - export TAG=$(git rev-parse --short ${TRAVIS_COMMIT})
         - docker login --password "$QUAY_PASSWORD" --username "$QUAY_USERNAME" quay.io
-        - make setup/dep setup/travis image/build/push TAG=$TAG
+        - make setup/travis image/build/push TAG=$TAG
         - docker tag quay.io/integreatly/$OPERATOR_NAME:$TAG quay.io/integreatly/$OPERATOR_NAME:$BRANCH
         - docker push quay.io/integreatly/$OPERATOR_NAME:$BRANCH
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ setup/dep:
 .PHONY: setup/travis
 setup/travis:
 	@echo Installing Operator SDK
-	@curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.8.1/operator-sdk-v0.8.1-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
+	@curl -Lo operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/v0.12.0/operator-sdk-v0.12.0-x86_64-linux-gnu && chmod +x operator-sdk && sudo mv operator-sdk /usr/local/bin/
 
 .PHONY: code/run
 code/run:

diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/go-openapi/swag v0.18.0 // indirect
 	github.com/google/uuid v1.1.0 // indirect
 	github.com/grafana-tools/sdk v0.0.0-20191103185352-c717bbeb00ed
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/openshift/api v3.9.1-0.20190424152011-77b8897ec79a+incompatible
 	github.com/operator-framework/operator-sdk v0.12.0
 	github.com/prometheus/client_golang v1.1.0 // indirect
@@ -21,7 +20,6 @@ require (
 	github.com/prometheus/procfs v0.0.7 // indirect
 	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
 	gopkg.in/ini.v1 v1.51.0 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v11.0.0+incompatible