Fix proto generation test

Signed-off-by: David Gageot <[email protected]>
GoogleContainerTools · Jul 5, 2019 · 7f56207 · 7f56207
1 parent 1d9bb69
commit 7f56207
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hack/generate-proto.sh b/hack/generate-proto.sh
@@ -23,6 +23,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
+set -e
 
 docker run $CONTAINER_NAME cat /${PROTO_PATH}/skaffold.pb.go > ${PROTO_PATH}/skaffold.pb.go
 docker run $CONTAINER_NAME cat /${PROTO_PATH}/skaffold.pb.gw.go > ${PROTO_PATH}/skaffold.pb.gw.go

diff --git a/hack/test-generated-proto.sh b/hack/test-generated-proto.sh
@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-cd $GOPATH/src/github.com/GoogleContainerTools/skaffold
-docker build -t generate-proto -f hack/proto/Dockerfile --target compare .
+export PROTO_PATH=pkg/skaffold/server/proto
+docker build -t generate-proto -f hack/proto/Dockerfile --target compare ${PROTO_PATH}
 if [ $? -ne 0 ]; then
    printf "\nGenerated proto files aren't updated. Please run ./hack/generate-proto.sh\n"
+   exit 1
 fi
 
 printf "\nGenerated proto files are updated!\n"
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ if [ $? -ne 0 ]; then @@
        exit 1
     fi
+    set -e
     docker run $CONTAINER_NAME cat /${PROTO_PATH}/skaffold.pb.go > ${PROTO_PATH}/skaffold.pb.go
     docker run $CONTAINER_NAME cat /${PROTO_PATH}/skaffold.pb.gw.go > ${PROTO_PATH}/skaffold.pb.gw.go
@@ Expand Down @@