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 017568b + b23e7d3 commit 991e864
Show file tree
Hide file tree
Showing 78 changed files with 2,315 additions and 1,279 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -39,4 +39,7 @@ tags
.vagrant

# runtime folder
/nodes/
/ckb.toml
/ckb-miner.toml
/data
/specs
16 changes: 13 additions & 3 deletions .travis.yml
Expand Up @@ -8,7 +8,7 @@ git:
depth: 2
submodules: false

if: 'branch IN (master, develop, staging, trying) OR type != push OR fork = true OR tag =~ ^v'
if: 'branch IN (master, develop, staging, trying) OR type != push OR fork = true OR tag IS present'

env:
global:
Expand All @@ -18,10 +18,10 @@ matrix:
include:
- rust: 1.33.0
os: osx
env: FMT=true CHECK=true TEST=true
env: FMT=true CHECK=true TEST=true REL_PKG=darwin_amd64.zip
- rust: 1.33.0
os: linux
env: TEST=true
env: TEST=true REL_PKG=linux_amd64.tar.gz

addons:
apt:
Expand All @@ -37,6 +37,16 @@ before_install: if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 8192; fi
install: ./devtools/ci/install.sh
script: ./devtools/ci/script.sh

deploy:
provider: releases
api_key: "$GITHUB_TOKEN"
file: "releases/ckb_${TRAVIS_TAG}_${REL_PKG}"
skip_cleanup: true
draft: true
on:
tags: true
condition: '"$GITHUB_TOKEN" != "" && "$REL_PKG" != ""'

before_cache:
- rm -rf ./target/debug/incremental/
- cargo sweep -f

0 comments on commit 991e864

Please sign in to comment.