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

Merge pull request #3636 from dmcgowan/fix-cri-darwin-release

Browse Source 
[CI] fix darwin build for cri release
This commit is contained in:
Akihiro Suda 2019-09-11 18:56:07 +09:00 committed by GitHub
commit 9dccbaa6ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -115,6 +115,7 @@ after_success:
before_deploy: before_deploy:
- make release - make release
- if [ "$TRAVIS_GOOS" = "linux" ]; then make cri-release; fi
deploy: deploy:
- provider: releases - provider: releases
@ -145,7 +146,8 @@ deploy:
file: file:
- releases/cri/*.tar.gz - releases/cri/*.tar.gz
- releases/cri/*.tar.gz.sha256 - releases/cri/*.tar.gz.sha256
# TODO: only deploy on tag after testing. on:
#on: repo: containerd/containerd
# repo: containerd/containerd # TODO: switch `tags: true` after validating on master
# tags: true branch: master
condition: $TRAVIS_GOOS = linux

11
Makefile
View File

@ -216,13 +216,20 @@ install-man:
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
$(foreach manpage,$(addprefix man/,$(MANPAGES)), $(call installmanpage,$(manpage),$(subst .,,$(suffix $(manpage))),$(notdir $(manpage)))) $(foreach manpage,$(addprefix man/,$(MANPAGES)), $(call installmanpage,$(manpage),$(subst .,,$(suffix $(manpage))),$(notdir $(manpage))))
release: $(BINARIES) releases/$(RELEASE).tar.gz: $(BINARIES)
@echo "$(WHALE) $@" @echo "$(WHALE) $@"
@rm -rf releases/$(RELEASE) releases/$(RELEASE).tar.gz @rm -rf releases/$(RELEASE) releases/$(RELEASE).tar.gz
@install -d releases/$(RELEASE)/bin @install -d releases/$(RELEASE)/bin
@install $(BINARIES) releases/$(RELEASE)/bin @install $(BINARIES) releases/$(RELEASE)/bin
@cd releases/$(RELEASE) && tar -czf ../$(RELEASE).tar.gz * @tar -czf releases/$(RELEASE).tar.gz -C releases/$(RELEASE) bin
@rm -rf releases/$(RELEASE)
release: $(BINARIES) releases/$(RELEASE).tar.gz
@echo "$(WHALE) $@"
@cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum @cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum
cri-release: $(BINARIES) releases/$(RELEASE).tar.gz
@echo "$(WHALE) $@"
@VERSION=$(VERSION:v%=%) script/release/release-cri @VERSION=$(VERSION:v%=%) script/release/release-cri
clean: ## clean up binaries clean: ## clean up binaries