github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1479 from stevvooe/baseline-api-txt

Browse Source 
api, linux/runcopts: ensure output is current
This commit is contained in:
Derek McGowan 2017-09-06 15:14:47 -07:00 committed by GitHub
commit 8b63386924
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -36,9 +36,8 @@ before_install:
- uname -r - uname -r
install: install:
- wget https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip -O /tmp/protoc-3.1.0-linux-x86_64.zip - wget https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip -O /tmp/protoc-3.3.0-linux-x86_64.zip
- unzip -o -d /tmp/protobuf /tmp/protoc-3.1.0-linux-x86_64.zip - sudo unzip -o -d /usr/local /tmp/protoc-3.3.0-linux-x86_64.zip
- export PATH=$PATH:/tmp/protobuf/bin/
- go get -u github.com/vbatts/git-validation - go get -u github.com/vbatts/git-validation
- sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-4/runc -O /bin/runc; sudo chmod +x /bin/runc - sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-4/runc -O /bin/runc; sudo chmod +x /bin/runc
- wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz - wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz
@ -57,6 +56,7 @@ script:
- make setup - make setup
- make vet - make vet
- make ineffassign - make ineffassign
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi
- make build - make build
- make binaries - make binaries
- if [ "$GOOS" = "linux" ]; then sudo make install ; fi - if [ "$GOOS" = "linux" ]; then sudo make install ; fi

8
Makefile
View File

@ -83,12 +83,18 @@ protos: bin/protoc-gen-gogoctrd ## generate protobuf
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@PATH=${ROOTDIR}/bin:${PATH} protobuild ${PACKAGES} @PATH=${ROOTDIR}/bin:${PATH} protobuild ${PACKAGES}
checkprotos: protos ## check if protobufs needs to be generated again check-protos: protos ## check if protobufs needs to be generated again
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@test -z "$$(git status --short | grep ".pb.go" | tee /dev/stderr)" || \ @test -z "$$(git status --short | grep ".pb.go" | tee /dev/stderr)" || \
((git diff | cat) && \ ((git diff | cat) && \
(echo "$(ONI) please run 'make generate' when making changes to proto files" && false)) (echo "$(ONI) please run 'make generate' when making changes to proto files" && false))
check-api-descriptors: protos ## check that protobuf changes aren't present.
@echo "$(WHALE) $@"
@test -z "$$(git status --short | grep ".pb.txt" | tee /dev/stderr)" || \
((git diff $$(find . -name '*.pb.txt') | cat) && \
(echo "$(ONI) please run 'make protos' when making changes to proto files and check-in the generated descriptor file changes" && false))
# Depends on binaries because vet will silently fail if it can't load compiled # Depends on binaries because vet will silently fail if it can't load compiled
# imports # imports
vet: ## run go vet vet: ## run go vet