Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
genotrance committed Sep 14, 2018
2 parents 2fc3106 + ee4c0ae commit cf7263d
Show file tree
Hide file tree
Showing 42 changed files with 984 additions and 377 deletions.
17 changes: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@ dist: trusty

language: c

cache:
directories:
- "$HOME/.nimble"
- "$HOME/.choosenim"

install:
- export CHOOSENIM_CHOOSE_VERSION="#7bb93c730ea87f"
- export NIM_LIB_PREFIX="$HOME/.choosenim/toolchains/nim-"$CHOOSENIM_CHOOSE_VERSION
- |
wget https://nim-lang.org/download/nim-0.17.2.tar.xz
tar -xf nim-0.17.2.tar.xz
cd nim-0.17.2
sh build.sh
cd ..
curl https://nim-lang.org/choosenim/init.sh -sSf > init.sh
sh init.sh -y
before_script:
- set -e
- set -x
- export PATH=`pwd`/nim-0.17.2/bin:$PATH
- export CHOOSENIM_NO_ANALYTICS=1
- export PATH=$HOME/.nimble/bin:$PATH

script:
- cd tests
Expand Down
1 change: 1 addition & 0 deletions nimble.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ license = "BSD"

bin = @["nimble"]
srcDir = "src"
installExt = @["nim"]

# Dependencies

Expand Down
4 changes: 2 additions & 2 deletions readme.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ Check out the [Creating Packages](#creating-packages) section for more info.

Publishes your Nimble package to the official Nimble package repository.

**Note:** Requires a valid GitHub account.
**Note:** Requires a valid GitHub account with an SSH key attached to it. To upload your public key onto your GitHub account, follow [this link](https://github.com/settings/keys).

### nimble tasks

Expand Down Expand Up @@ -905,7 +905,7 @@ The ``master`` branch is...

* default
* bleeding edge
* tested to compile with the latest Nim version
* tested to compile with a pinned (close to HEAD) commit of Nim

The ``stable`` branch is...

Expand Down
Loading

0 comments on commit cf7263d

Please sign in to comment.