Skip to content

Commit

Permalink
Merge remote-tracking branch 'skycoin/develop' into olemis_t992_libsk…
Browse files Browse the repository at this point in the history
…ycoin_tests
  • Loading branch information
olemis committed May 22, 2018
2 parents b8cce2a + 7611767 commit aeee905
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,5 @@ docs/libc/man
docs/libc/xml


# Do not ignore Docker Cloud build
!hooks/build
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ sudo: required
dist: trusty
language: go
go:
- "1.9.x"
- "1.10.x"

matrix:
Expand Down Expand Up @@ -44,8 +43,8 @@ install:
- go get github.com/gz-c/gox
# Install dependences for building wallet
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" == false ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils && nvm install 8; fi
- mkdir -p "$GOPATH/src/github.com/skycoin" && if [[ ! -d "$GOPATH/src/github.com/skycoin/skycoin" ]] ; then ln -s "$TRAVIS_BUILD_DIR" "$GOPATH/src/github.com/skycoin/skycoin"; fi
- cd "$GOPATH/src/github.com/skycoin/skycoin"
- if [[ ! -d $GOPATH/src/github.com/skycoin/skycoin ]]; then mkdir -p $GOPATH/src/github.com/skycoin; ln -s $TRAVIS_BUILD_DIR $GOPATH/src/github.com/skycoin/skycoin; fi
- cd $GOPATH/src/github.com/skycoin/skycoin
- go get -t ./...
- make install-linters
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq g++-6 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90; fi
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]

### Added

- Add environment variable `DATA_DIR` in CLI's
- `USE_CSRF` environment variable for CLI, if the remote node has CSRF enabled (CSRF is enabled by default, use `-disable-csrf` to disable)
- `cli showConfig` command to echo the cli's configuration back to the user
Expand All @@ -23,7 +24,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Expose known block height of peer in brand new `height` field added in responses of `GET /api/v1/network/connections` API endpoints
- `-verify-db` option (default true), will verify the database integrity during startup and exit if a problem is found
- `-reset-corrupt-db` option (default false) will verify the database integrity during startup and reset the db if a problem is found
- `GET /explorer/address`: add `size` and `fee` to transaction objects and `calculated_hours` to transaction inputs
- `GET /explorer/address`: add `fee` to transaction objects and `calculated_hours` to transaction inputs
- Test data generator and test suite for verification of alternative `cipher` implementations

### Fixed

Expand All @@ -38,12 +40,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- API response will be gzip compressed if client sends request with 'Accept-Encoding' contains 'gzip' in the header.
- `GET /api/v1/wallet/balance` and `GET /api/v1/balance` now return an address balance list as well.
- API endpoints are prefixed with `/api/v1/`. API endpoints without the `/api/v1/` prefix are deprecated but can be enabled with `-enable-unversioned-api`. Please migrate to use `/api/v1/` prefix in URLs.
- Enable message protocol upgrade

### Removed

- Remove `-rpc-interface-addr`, `-rpc-interface-port` options. The RPC interface is now on default port `6420` with the REST API.
- Remove `-rpc-thread-num` option
- Remove `-connect-to` option
- Remove support for go1.9

## [0.23.0] - 2018-04-22

Expand Down
10 changes: 5 additions & 5 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Installing go

Skycoin supports go1.9+. The preferred version is go1.10.
Skycoin supports go1.10+.

## For OSX
First you need to have `homebrew` installed, if you don't have it yet.
Expand Down Expand Up @@ -53,16 +53,16 @@ In China, use `--source=https://github.com/golang/go` to bypass firewall when fe
gvm install go1.4 --source=https://github.com/golang/go
gvm use go1.4

gvm install go1.9
gvm use go1.9 --default
gvm install go1.10.2
gvm use go1.10.2 --default
```

#### Installation issues
If you open up new a terminal and the `go` command is not found then add this to `.bashrc`. GVM should add this automatically.

```sh
[[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
gvm use go1.9 >/dev/null
gvm use go1.10.2 >/dev/null
```

## Install Go manually
Expand All @@ -72,7 +72,7 @@ Let's go to home directory and declare `go`'s version that you want to download.

```sh
cd ~
export GOV=1.10 # golang version. Could be any of the following versions 1.9, 1.10
export GOV=1.10.2 # golang version
```

After that, let's download and uncompress golang source.
Expand Down

0 comments on commit aeee905

Please sign in to comment.