Merge pull request #89 from jodh-intel/restructure-build-system

build: Move CLI makefile to top level
kata-containers · Mar 22, 2018 · 1961d72 · 1961d72
2 parents 1923361 + ea4050e
commit 1961d72
Show file tree

Hide file tree

Showing 7 changed files with 476 additions and 512 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /build-runv
+/kata-runtime
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,6 @@ dist: trusty
 
 language: go
 
-env:
-  - KATA_RUNTIME=cc
-  - KATA_RUNTIME=runv
-
 go:
   - 1.8
 
@@ -21,7 +17,5 @@ before_script:
 
 install:
   - cd ${TRAVIS_BUILD_DIR}
-  - pushd cli
-  - make KATA_RUNTIME=${KATA_RUNTIME}
-  - sudo -E PATH=$PATH make KATA_RUNTIME=${KATA_RUNTIME} install
-  - popd
+  - make
+  - sudo -E PATH=$PATH make install