Skip to content

Commit

Permalink
Merge branch 'master' into warp_sync_on_light_client
Browse files Browse the repository at this point in the history
* master: (95 commits)
  remove empty file (openethereum#8705)
  Update mod.rs (openethereum#8695)
  Use impl Future in the light client RPC helpers (openethereum#8628)
  Fix cli signer (openethereum#8682)
  Allow making direct RPC queries from the C API (openethereum#8588)
  Remove the error when stopping the network (openethereum#8671)
  Move connection_filter to the network crate (openethereum#8674)
  Remove HostInfo::client_version() and secret() (openethereum#8677)
  Refactor EIP150, EIP160 and EIP161 forks to be specified in CommonParams  (openethereum#8614)
  parity: improve cli help and logging (openethereum#8665)
  updated tiny-keccak to 1.4.2 (openethereum#8669)
  Remove the Keccak C library and use the pure Rust impl (openethereum#8657)
  Remove HostInfo::next_nonce (openethereum#8644)
  Fix not downloading old blocks (openethereum#8642)
  Resumable warp-sync / Seed downloaded snapshots (openethereum#8544)
  Don't open Browser post-install on Mac (openethereum#8641)
  Changelog for 1.10.4-stable and 1.11.1-beta (openethereum#8637)
  typo (openethereum#8640)
  Fork choice and metadata framework for Engine (openethereum#8401)
  Check that the Android build doesn't dep on c++_shared (openethereum#8538)
  ...
  • Loading branch information
ordian committed May 24, 2018
2 parents 763cd1f + e346f30 commit 06d719a
Show file tree
Hide file tree
Showing 346 changed files with 26,653 additions and 13,637 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ node_modules
out/

.vscode

rls/
/parity.*
26 changes: 23 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cache:
paths:
- target/
untracked: true
linux-stable:
linux-ubuntu:
stage: build
image: parity/rust:gitlab-ci
only:
Expand All @@ -31,7 +31,7 @@ linux-stable:
paths:
- parity.zip
name: "stable-x86_64-unknown-linux-gnu_parity"
linux-stable-debian:
linux-debian:
stage: build
image: parity/rust-debian:gitlab-ci
only:
Expand Down Expand Up @@ -80,6 +80,7 @@ linux-i686:
paths:
- parity.zip
name: "i686-unknown-linux-gnu"
allow_failure: true
linux-armv7:
stage: build
image: parity/rust-armv7:gitlab-ci
Expand All @@ -96,6 +97,7 @@ linux-armv7:
paths:
- parity.zip
name: "armv7_unknown_linux_gnueabihf_parity"
allow_failure: true
linux-arm:
stage: build
image: parity/rust-arm:gitlab-ci
Expand All @@ -112,6 +114,7 @@ linux-arm:
paths:
- parity.zip
name: "arm-unknown-linux-gnueabihf_parity"
allow_failure: true
linux-aarch64:
stage: build
image: parity/rust-arm64:gitlab-ci
Expand Down Expand Up @@ -177,6 +180,23 @@ windows:
paths:
- parity.zip
name: "x86_64-pc-windows-msvc_parity"
android-armv7:
stage: build
image: parity/parity-android:latest
only:
- beta
- tags
- stable
- triggers
script:
- cargo build --target=armv7-linux-androideabi
- if [ $(arm-linux-androideabi-objdump -x ./target/armv7-linux-androideabi/debug/parity | grep -i 'c++_shared' | wc -l) -ne 0]; then echo "FAIL!!" fi
tags:
- rust-arm
artifacts:
paths:
- parity.zip
name: "armv7-linux-androideabi_parity"
docker-build:
stage: build
only:
Expand All @@ -185,7 +205,7 @@ docker-build:
before_script:
- docker info
script:
- if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
- if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
- echo "Tag:" $DOCKER_TAG
- docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
- scripts/docker-build.sh $DOCKER_TAG
Expand Down
597 changes: 366 additions & 231 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit 06d719a

Please sign in to comment.