trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject [incubator-trafficcontrol] 01/03: fix traffic_ops build to copy in vendor directory
Date Wed, 02 May 2018 22:28:13 GMT
This is an automated email from the ASF dual-hosted git repository.

rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit e67914bee0f046df577aae8ce6ded63d7eb930a0
Author: Dylan Volz <Dylan_Volz@comcast.com>
AuthorDate: Wed May 2 13:07:44 2018 -0600

    fix traffic_ops build to copy in vendor directory
---
 traffic_ops/build/traffic_ops.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index 4cac1de..8635b36 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -67,7 +67,7 @@ Built: %(date) by %{getenv: USER}
     # Create build area with proper gopath structure
     mkdir -p src pkg bin || { echo "Could not create directories in $(pwd): $!"; exit 1;
}
 
-
+     
 
     # build all internal go dependencies (expects package being built as argument)
     build_dependencies () {
@@ -92,10 +92,16 @@ Built: %(date) by %{getenv: USER}
            fi
        done
     }
+    oldpwd=$(pwd)
+    #copy in traffic_ops/vendor
+    vendordir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/vendor 
+    ( mkdir -p "$vendordir" && \
+      cd "$vendordir" && \
+      cp -r "$TC_DIR"/traffic_ops/vendor/* . \
+    ) || { echo "could not copy traffic_ops/vendor directory"; exit 1; } 
 
     # build traffic_ops_golang binary
     godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/traffic_ops_golang
-    oldpwd=$(pwd)
     ( mkdir -p "$godir" && \
       cd "$godir" && \
       cp -r "$TC_DIR"/traffic_ops/traffic_ops_golang/* . && \

-- 
To stop receiving notification emails like this one, please contact
rob@apache.org.

Mime
View raw message