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

Installation && Exectution Optimization. #334

Merged
merged 3 commits into from Apr 1, 2019
Merged

Installation && Exectution Optimization. #334

merged 3 commits into from Apr 1, 2019

Conversation

clearloop
Copy link
Contributor

@clearloop clearloop commented Mar 17, 2019

Features

./cita directly.

Optimization

1. Node 'test-chain/0' not responding to pings

if not daemon.sh bin/cita start test-chain/0, this bug occurs.

Added a condition into cita/env.sh, if run start command, daemon automatically

2. Unable to resolve host linuxkit-025000000001

mac environment should set --net=bridge

Added a condition into cita/env.sh, if on macOS, the tag will move to bridge.

3. Node Directory Not Found

Should run `bin/cita <command>' while operating node.

Replaced pwd as $0, to fix the scripts' route.

@kaikai1024
Copy link
Contributor

Please rebase the latest develop branch.

@clearloop clearloop changed the title Product Environment && Docker Optimization. Installation && Exectution Optimization. Mar 18, 2019
@clearloop
Copy link
Contributor Author

Should I back to 2018....

Crazy Night🤦🏻‍♂️

@kaikai1024
Copy link
Contributor

@leeyr338

Makefile Outdated Show resolved Hide resolved
@kaikai1024
Copy link
Contributor

kaikai1024 commented Mar 27, 2019

Are you still working on this? Is there something i can help? @clearloop

@clearloop
Copy link
Contributor Author

clearloop commented Mar 27, 2019

Are you still working on this? Is there something i can help?

I'd like to write a formula or snap to make cita installing and using easier, I've made the formula works in my branch, but they should depend on official resources

In current commit, I modified

  • cita/env.sh
  • cita/scripts/cita
  • cita/scripts/release.sh

and deleted

  • cita/daemon.sh
  • cita/scripts/env.sh
  • cita/scripts/daemon.sh

Users can use cita, cita-env and cita-config in global environment in my scripts.

And in current version, cita and cita-cli are separated, it's quite clean, cita no need to nest too many commands just like geth.

I don't know how to continue, I can't change too many files once time, if I did it, the scripts will deviate from the main track.

So I wrote a dapp on cita last days XD

@kaikai1024
Copy link
Contributor

I'd like to write a formula or snap to make cita installing and using easier, I've made the formula works in my branch, but they should depend on official resources

I will check this later.

Now, let's focus on this pr and fix the CI.

@kaikai1024
Copy link
Contributor

I don't know how to continue, I can't change too many files once time, if I did it, the scripts will deviate from the main track.

The CI is required for merging. Or is there some way to sperate it to many little ones? Can you read the info about the circle and travis? If not, you can try to run ci on your local pc. or i can help to fix it.

@kaikai1024
Copy link
Contributor

kaikai1024 commented Mar 27, 2019

Users can use cita, cita-env and cita-config in global environment in my scripts.

That's also what i want to do.

@clearloop
Copy link
Contributor Author

The CI is required for merging. Or is there some way to sperate it to many little ones? Can you read the info about the circle and travis? If not, you can try to run ci on your local pc. or i can help to fix it.

Oops, it was my fault, I forgot to modify the CI's code to build tests, I will optimize my code again and make it through myself, soon, thx for your reminder~

@kaikai1024
Copy link
Contributor

cool, I will help to fix the travisCI.

scripts/cita Show resolved Hide resolved
env.sh Show resolved Hide resolved
@kaikai1024 kaikai1024 added the squash merging Used by pull request label Mar 28, 2019
env.sh Show resolved Hide resolved
env.sh Outdated Show resolved Hide resolved
kaikai1024
kaikai1024 previously approved these changes Mar 29, 2019
@kaikai1024
Copy link
Contributor

kaikai1024 commented Mar 29, 2019

TODO: the doc(you can update the doc at the same time)

squash merging

@yangby-cryptape need yang's approve, please take a little time to take a look

it's better to sort out your commits.

@clearloop
Copy link
Contributor Author

clearloop commented Mar 29, 2019

squash merging

Should I squash and force push now? I'm quite afraid of squash...XD, but I've tested it on my test branch, so many commits make me feel...I'm such a trouble maker...If cita team don't mind, I want to try to squash my commits by myself again.

@kaikai1024
Copy link
Contributor

Should I squash and force push now?

It's up to you.

My job is to keep the commits of develop clean. That's means i will use squash merging(package the commits to a commit) when i think the commits is a little messy or the pr is should be one commit.

nice job. just wait for another approval!

@kaikai1024
Copy link
Contributor

And, would you like to contribute to the doc about the part that you changed?

please let me know and then i decide to create an issue or not.

thank you. ❤️

@kaikai1024
Copy link
Contributor

Have you rebased the latest develop? and updated the submodule?

the bft and forever should not be updated.

@clearloop
Copy link
Contributor Author

clearloop commented Mar 29, 2019

Have you rebased the latest develop? and updated the submodule?

the bft and forever should not be updated.

yep,I'll write the doc and try to fix the submodule problem if I can, anyway, I'm a rust developer...

@kaikai1024
Copy link
Contributor

kaikai1024 commented Mar 29, 2019

I'm a rust developer.

🦀

Welcome to TUCAO the codes of CITA.

And https://rustcon.asia/

@kaikai1024 kaikai1024 merged commit dc45dca into citahub:develop Apr 1, 2019
@kaikai1024
Copy link
Contributor

I will update the doc. @clearloop citahub/citahub-docs#115

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
squash merging Used by pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants