Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: make rpm package script works #2100

Merged
merged 1 commit into from
Aug 16, 2018

Conversation

chuanchang
Copy link
Contributor

Makefile: split download-dependencies into package-dependencies and
download-dependencies for reusing codes in packaging.
hack/package/rpm/build.sh: synchronize Makefile changes

Signed-off-by: Alex Jia [email protected]

Ⅰ. Describe what this PR did

as summary

Ⅱ. Does this pull request fix one issue?

None

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

None

Ⅳ. Describe how to verify it

https://github.com/alibaba/pouch/tree/master/hack/package

Ⅴ. Special notes for reviews

@chuanchang chuanchang requested a review from fuweid August 15, 2018 10:13
@fuweid fuweid changed the title fix rpm packaging issues bugfix: make rpm package script works Aug 15, 2018
@pouchrobot pouchrobot added the kind/bug This is bug report for project label Aug 15, 2018
hack/install/install_runc.sh

.PHONY: download-dependencies
download-dependencies: package-dependencies ## install dumb-init, local-persist, nsenter and CI tools dependencies
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should change .travis.yml or .circle.yml

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, I have updated .travis.yml with Makefile changes.

@chuanchang chuanchang force-pushed the fix_package_issue branch 2 times, most recently from 75513c2 to 6337ee7 Compare August 15, 2018 10:26
Makefile: split download-dependencies into package-dependencies and
          download-dependencies for reusing codes in packaging.

.travis.yml:
hack/package/rpm/build.sh: synchronize changes with Makefile

Signed-off-by: Alex Jia <[email protected]>
@codecov-io
Copy link

Codecov Report

Merging #2100 into master will increase coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2100      +/-   ##
==========================================
+ Coverage   65.14%   65.17%   +0.03%     
==========================================
  Files         208      208              
  Lines       16407    16407              
==========================================
+ Hits        10688    10694       +6     
+ Misses       4388     4385       -3     
+ Partials     1331     1328       -3
Flag Coverage Δ
#criv1alpha1test 33.29% <ø> (+0.08%) ⬆️
#criv1alpha2test 33.87% <ø> (+0.03%) ⬆️
#integrationtest 39.86% <ø> (-0.02%) ⬇️
#unittest 23.84% <ø> (ø) ⬆️
Impacted Files Coverage Δ
daemon/mgr/system.go 77.68% <0%> (-1.66%) ⬇️
daemon/logger/jsonfile/utils.go 73.17% <0%> (+1.62%) ⬆️
ctrd/image.go 78.94% <0%> (+1.75%) ⬆️
cri/stream/httpstream/spdy/upgrade.go 60% <0%> (+5.71%) ⬆️

@fuweid
Copy link
Contributor

fuweid commented Aug 16, 2018

LGTM

@fuweid fuweid merged commit f80ddaa into AliyunContainerService:master Aug 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants