vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #380 from feiskyer/fix-make

Browse source 
Fix make
This commit is contained in:
Mrunal Patel 2017-03-02 08:07:06 -08:00 committed by GitHub
commit b872bc2fde
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -12,7 +12,7 @@ services:
before_install: before_install:
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
install: install:
- make install.tools - make install.tools
@ -26,6 +26,7 @@ script:
- make lint - make lint
- make integration - make integration
- make docs - make docs
- make
notifications: notifications:
irc: "chat.freenode.net#ocid" irc: "chat.freenode.net#ocid"

2
Makefile
View file

@ -69,7 +69,7 @@ kpod: check-gopath
$(GO) build -o $@ $(PROJECT)/cmd/kpod $(GO) build -o $@ $(PROJECT)/cmd/kpod
ocid.conf: ocid ocid.conf: ocid
ocid --config="" config --default > ocid.conf ./ocid --config="" config --default > ocid.conf
clean: clean:
rm -f docs/*.1 docs/*.5 docs/*.8 rm -f docs/*.1 docs/*.5 docs/*.8