Skip to content

Commit

Permalink
Merge branch 'develop' into deny-missing-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
doitian committed Oct 29, 2020
2 parents 68121d2 + 791c301 commit b815fe5
Show file tree
Hide file tree
Showing 83 changed files with 696 additions and 553 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: rust
rust: 1.45.2
rust: 1.46.0
dist: xenial
sudo: true
cache:
Expand Down Expand Up @@ -114,13 +114,15 @@ matrix:
rust: stable
script:
- devtools/ci/check-cyclic-dependencies.py --dev
- name: Security Audit
- name: Security Audit & Licenses
if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
os: linux
install:
- cargo audit --version || travis_retry cargo install cargo-audit --locked
- cargo deny --version || travis_retry cargo install cargo-deny --locked
script:
- make security-audit
- make check-crates
- make check-licenses

- name: WASM build
if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
Expand Down Expand Up @@ -165,7 +167,7 @@ matrix:
if: 'tag IS present AND env(GITHUB_TOKEN) IS present'
language: ruby
addons: { apt: { packages: [] } }
env: REL_PKG=x86_64-unknown-linux-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:xenial-rust-1.45.2
env: REL_PKG=x86_64-unknown-linux-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:xenial-rust-1.46.0
script:
- mkdir -p $HOME/.cargo
- docker run --rm -it -w /ckb -v $(pwd):/ckb -v $HOME/.cargo:/root/.cargo -e OPENSSL_STATIC=1 -e OPENSSL_LIB_DIR=/usr/local/lib -e OPENSSL_INCLUDE_DIR=/usr/local/include/openssl $BUILDER_IMAGE make prod
Expand All @@ -177,7 +179,7 @@ matrix:
if: 'tag IS present AND env(GITHUB_TOKEN) IS present'
language: ruby
addons: { apt: { packages: [] } }
env: REL_PKG=x86_64-unknown-centos-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:centos-7-rust-1.45.2
env: REL_PKG=x86_64-unknown-centos-gnu.tar.gz BUILDER_IMAGE=nervos/ckb-docker-builder:centos-7-rust-1.46.0
script:
- mkdir -p $HOME/.cargo
- docker run --rm -it -w /ckb -v $(pwd):/ckb -v $HOME/.cargo:/root/.cargo $BUILDER_IMAGE scl enable llvm-toolset-7 'make prod'
Expand Down
Loading

0 comments on commit b815fe5

Please sign in to comment.