From b809d4926e510ad4115b87b6784255d417e6bae7 Mon Sep 17 00:00:00 2001 From: Ish Shah Date: Mon, 25 Jun 2018 16:21:58 -0700 Subject: [PATCH 1/2] Add rm of existing pkg dir --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2b5ab6280eb..23852663c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ script: - cd $GOPATH/src/github.com/example-inc - operator-sdk new memcached-operator --api-version=cache.example.com/v1alpha1 --kind=Memcached - cd memcached-operator +- rm -rf vendor/github.com/operator-framework/operator-sdk/pkg - ln -sf ${TRAVIS_BUILD_DIR}/pkg vendor/github.com/operator-framework/operator-sdk/pkg - curl https://raw.githubusercontent.com/operator-framework/operator-sdk/master/example/memcached-operator/handler.go.tmpl -o pkg/stub/handler.go - head -n -6 pkg/apis/cache/v1alpha1/types.go > tmp.txt From 45791cde15075b450e7382b3eaff6a020840ce5c Mon Sep 17 00:00:00 2001 From: Ish Shah Date: Tue, 26 Jun 2018 09:11:29 -0700 Subject: [PATCH 2/2] remove -f flag from ln --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 23852663c7d..5aba9b67f36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ script: - operator-sdk new memcached-operator --api-version=cache.example.com/v1alpha1 --kind=Memcached - cd memcached-operator - rm -rf vendor/github.com/operator-framework/operator-sdk/pkg -- ln -sf ${TRAVIS_BUILD_DIR}/pkg vendor/github.com/operator-framework/operator-sdk/pkg +- ln -s ${TRAVIS_BUILD_DIR}/pkg vendor/github.com/operator-framework/operator-sdk/pkg - curl https://raw.githubusercontent.com/operator-framework/operator-sdk/master/example/memcached-operator/handler.go.tmpl -o pkg/stub/handler.go - head -n -6 pkg/apis/cache/v1alpha1/types.go > tmp.txt - mv tmp.txt pkg/apis/cache/v1alpha1/types.go