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

wiki: Move client quick install guide. #1715

Merged
merged 2 commits into from Aug 13, 2022
Merged

Conversation

JoeGruffins
Copy link
Member

@JoeGruffins JoeGruffins commented Jul 18, 2022

wiki: Move client install guides.

wiki: Update contributing instructions.

Depends on #1714 atm. Depends on #1747. Part of #1641.


`cd wiki; git remote add me https://github.com/your-username/dcrdex.wiki.git`
```
git push wiki `git subtree split --prefix docs/wiki HEAD`:master --force
Copy link
Member

Choose a reason for hiding this comment

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

Cool learning about subtree!

Was looking at docs for the commands and came across tihs:

   push <repository> [+][<local-commit>:]<remote-ref>
       Does a split using the <prefix> subtree of <local-commit> and then
       does a git push to push the result to the <repository> and
       <remote-ref>. This can be used to push your subtree to different
       branches of the remote repository. Just as with split, if no
       <local-commit> is given, then HEAD is used. The optional leading + is
       ignored.

Sounds like git subtree push does a split and then a git push. Doesn't that make this command the same as git subtree push -f --prefix docs/wiki wiki HEAD:master (where HEAD is actually implied if omitted)?

Copy link
Member Author

Choose a reason for hiding this comment

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

Does -f force? Testing...

Copy link
Member Author

Choose a reason for hiding this comment

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

For me -f doesn't work. The subtree commands seem to be limited. So, we force push the changes to our wiki branch. Forcing because it's easiest.

The commits in the dcrdex wiki also look clean. Here they are after this pr and changes are pushed:

commit fb034729f912cc3b0e50e7705293bb2cf2407108 (HEAD -> master, origin/master, origin/HEAD)
Author: JoeGruff <joegruffins@gmail.com>
Date:   Mon Jul 18 17:39:30 2022 +0900

    wiki: Move client quick install guide.

commit a30891073d7d646fe2d055e2c15b356d1580d4fe
Author: JoeGruff <joegruffins@gmail.com>
Date:   Mon Jul 18 15:13:42 2022 +0900

    wiki: Update contributing instructions.

commit 3f0a68ea2897c54c64c9d859b7b7c5575fd4387e (upstream/master)
Author: Jonathan Chappelow <chappjc@users.noreply.github.com>
Date:   Fri Jul 8 14:28:02 2022 -0500

    Updated Native BTC Wallet Recovery and Rescanning (markdown)

Copy link
Member

@chappjc chappjc Jul 19, 2022

Choose a reason for hiding this comment

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

Yes, force is cleanest - just reset the remote ref.
I figured [<options>] would get passed through to the underlying git commands (i.e. push), but clearly not.
In that case, yeah, your command looks good. Except lets use $() evaluation instead of backticks.

Copy link
Member Author

Choose a reason for hiding this comment

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

HEAD was not necessary so removed.

Except lets use $()

ok

Copy link
Member Author

Choose a reason for hiding this comment

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

Using $().

@JoeGruffins JoeGruffins force-pushed the clientguide branch 2 times, most recently from 7e5eaae to 1c5924f Compare July 19, 2022 01:51
`git clone https://github.com/decred/dcrdex.wiki.git wiki`
```
git remote add wiki https://github.com/your-username/dcrdex.wiki.git
git subtree push --prefix docs/wiki wiki master
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm assuming that wiki master does not yet exist here. I'm not sure tho... Will try to test will a different repo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Trying on a different repo, it looks like master is created with an initial commit. So, delete master and then push.

@JoeGruffins
Copy link
Member Author

JoeGruffins commented Aug 1, 2022

I think I've added something wierd with commit 5571c0d +15,604 −57 fixing...

edit: fixed..

@JoeGruffins JoeGruffins force-pushed the clientguide branch 2 times, most recently from eea8eca to de0f73f Compare August 1, 2022 03:09
@JoeGruffins JoeGruffins marked this pull request as ready for review August 1, 2022 03:11
@JoeGruffins
Copy link
Member Author

Will rebase on top of #1747

@buck54321 buck54321 mentioned this pull request Aug 4, 2022
24 tasks
docs/wiki/Client.mediawiki Outdated Show resolved Hide resolved
Comment on lines 27 to 35
===Sync Blockchains===

Once installed, begin syncing your blockchains. In a new console, run

<code>cd ~/decred</code>

<code>./dcrd</code>

Decred should sync within a couple of hours.
Copy link
Member

Choose a reason for hiding this comment

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

This is not current advice for a "quick start" guide. Let's direct them to use the native wallets instead.

You can move the RPC wallet instructions somewhere else, but I'm not sure it makes sense to try to describe Decred and Bitcoin together anymore.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated with #1747 so ok?

'''WARNING''': If instead of using '''dcrinstall''' you decide to build from source and
you plan to trade on mainnet, use the <code>release-v0.3</code> branch instead of <code>master</code>.
Furthermore, if you build dcrd and dcrwallet from source, you '''must''' use their
<code>release-v1.7</code> branches, not <code>master</code>.
Copy link
Member

Choose a reason for hiding this comment

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

release-v1.7.4 for both, right now.

Copy link
Member

Choose a reason for hiding this comment

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

This is an interesting point. The branch for all 1.7.x releases is release-v1.7 while the latest tag will be something like release-v1.7.4. I've been leaning toward release branches to avoid needing to update the docs for every release.

Copy link
Member Author

Choose a reason for hiding this comment

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

Using release-v1.7...

@@ -1,4 +1,63 @@
==Client (dexc) ==
=Guides=
Copy link
Member

@chappjc chappjc Aug 4, 2022

Choose a reason for hiding this comment

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

Am I the only one who seriously dislikes mediawiki? Would anything be lost by using md? I guess the nice tables for the various payloads rely on it.

BTW, what's the audience for this page? Before it was some advanced technical docs, which are still at the bottom, but now it begins with some basic setup stuff.

I hope my modifications to the README "quick start" in #1747 aren't off-base, but I feel like I've reduced it to very basics that a prospective user dropping in on the github repo would need. Namely, how to install, how to run and configure, and anything else to keep in mind.

Copy link
Member

Choose a reason for hiding this comment

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

Am I the only one who seriously dislikes mediawiki? Would anything be lost by using md? I guess the nice tables for the various payloads rely on it.

Meh.

BTW, what's the audience for this page? Before it was some advanced technical docs, which are still at the bottom, but now it begins with some basic setup stuff.

I was kind of thinking that too. The page seems to be a catchall for client stuff. I figured we can always break it up later.

Copy link
Member

Choose a reason for hiding this comment

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

I figured we can always break it up later

Sounds good. Let's just get things moving. It's just the wiki.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do... you want to do .md? I have absolutely no preference and don't know a whole lot about either.

Copy link
Member

@chappjc chappjc Aug 5, 2022

Choose a reason for hiding this comment

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

Ok to leave this client control mediawiki since it actually uses mediawiki stuff, but might as well keep things markdown if they are already markdown, and new pages should prefer md.

There's just no simple way to render mediawiki without deploying it to a webserver.

Copy link
Member Author

Choose a reason for hiding this comment

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

Newest comment just makes a new .md file.

@JoeGruffins JoeGruffins force-pushed the clientguide branch 2 times, most recently from d170789 to e239331 Compare August 5, 2022 07:17
@JoeGruffins
Copy link
Member Author

JoeGruffins commented Aug 5, 2022

The first comment has not changed but second one now makes a new file Client-Installation-and-Configuration.md and moves the client guides. This is just a quick and dirty move, but I think accomplishes what we want. i.e. move the client guides to the wiki.

@chappjc chappjc merged commit f71fd09 into decred:master Aug 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants