Skip to content

Commit

Permalink
Merge branch 'rc/v0.9.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
doitian committed Apr 11, 2019
2 parents 76cc48d + 45a5fca commit 0661659
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -42,7 +42,6 @@ deploy:
api_key: "$GITHUB_TOKEN"
file: "releases/ckb_${TRAVIS_TAG}_${REL_PKG}"
skip_cleanup: true
draft: true
on:
tags: true
condition: '"$GITHUB_TOKEN" != "" && "$REL_PKG" != ""'
Expand Down
2 changes: 1 addition & 1 deletion devtools/ci/script.sh
Expand Up @@ -33,7 +33,7 @@ if [ -n "$TRAVIS_TAG" -a -n "$GITHUB_TOKEN" -a -n "$REL_PKG" ]; then
mkdir "releases/$PKG_NAME"
mv target/release/ckb "releases/$PKG_NAME"
cp README.md CHANGELOG.md COPYING "releases/$PKG_NAME"
cp -R devtools/init/ "releases/$PKG_NAME"
cp -R devtools/init "releases/$PKG_NAME"
if [ -d docs ]; then
cp -R docs "releases/$PKG_NAME"
fi
Expand Down
2 changes: 1 addition & 1 deletion devtools/init/linux-systemd/README.md
Expand Up @@ -22,7 +22,7 @@ Setup the directories and generate config files for testnet.

```bash
sudo mkdir /var/lib/ckb
sudo /usr/local/bin/ckb init -C /var/lib/ckb --spec testnet --log stdout
sudo /usr/local/bin/ckb init -C /var/lib/ckb --spec testnet --log-to stdout
```

Setup the user and group and the appropriate ownership and permissions.
Expand Down
2 changes: 1 addition & 1 deletion devtools/init/linux-systemd/ckb.service
Expand Up @@ -9,7 +9,7 @@ User=ckb
Group=ckb
WorkingDirectory=/var/lib/ckb

ExecStart=/usr/local/bin/ckb
ExecStart=/usr/local/bin/ckb run
Restart=on-abnormal
KillMode=mixed
TimeoutStopSec=5s
Expand Down
18 changes: 16 additions & 2 deletions docs/get-ckb.md
Expand Up @@ -5,6 +5,9 @@
We will publish binaries for each release via [Github Releases](https://github.com/nervosnetwork/ckb/releases). If your system
is listed there, you can download the package directory.

There is also a repository [ckb-nightly](https://github.com/nervosnetwork/ckb-nightly/releases) containing the nightly builds from the develop
branch.


## Build from Source

Expand Down Expand Up @@ -41,7 +44,11 @@ sudo pacman -Sy git gcc pkgconf clang
brew install autoconf libtool
```

### Build from master branch
### Build from source

The `master` branch is regularly built and tested. It is always the latest released version. The default checked out branch `develop` is the latest version in development.

It is recommended to build a version from master.

```bash
# get ckb source code
Expand All @@ -56,8 +63,15 @@ make build
This will build the executable `target/release/ckb`. Please add the directory
to `PATH` or copy/link the file into a directory already in the `PATH`.

```base
```bash
export PATH="$(pwd)/target/release:$PATH"
# or
# ln -snf "$(pwd)/target/release/ckb" /usr/local/bin/ckb
```

It is easy to switch to a history version and build, for example, check out
v0.8.0:

```bash
git checkout -b branch-v0.8.0 v0.8.0
```

0 comments on commit 0661659

Please sign in to comment.