Renaming evm binary to avoid conflicts. (#4899)

This commit is contained in:
Tomasz Drwięga 2017-03-14 13:08:55 +01:00 committed by Gav Wood
parent 2dca24cc28
commit 57770ce84c
2 changed files with 11 additions and 11 deletions

View File

@ -26,14 +26,14 @@ linux-stable:
- cargo build -j $(nproc) --release -p ethstore - cargo build -j $(nproc) --release -p ethstore
- cargo build -j $(nproc) --release -p ethkey - cargo build -j $(nproc) --release -p ethkey
- strip target/release/parity - strip target/release/parity
- strip target/release/evm - strip target/release/parity-evm
- strip target/release/ethstore - strip target/release/ethstore
- strip target/release/ethkey - strip target/release/ethkey
- export SHA3=$(target/release/parity tools hash target/release/parity) - export SHA3=$(target/release/parity tools hash target/release/parity)
- md5sum target/release/parity > parity.md5 - md5sum target/release/parity > parity.md5
- sh scripts/deb-build.sh amd64 - sh scripts/deb-build.sh amd64
- cp target/release/parity deb/usr/bin/parity - cp target/release/parity deb/usr/bin/parity
- cp target/release/evm deb/usr/bin/evm - cp target/release/parity-evm deb/usr/bin/parity-evm
- cp target/release/ethstore deb/usr/bin/ethstore - cp target/release/ethstore deb/usr/bin/ethstore
- cp target/release/ethkey deb/usr/bin/ethkey - cp target/release/ethkey deb/usr/bin/ethkey
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n") - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
@ -55,9 +55,9 @@ linux-stable:
artifacts: artifacts:
paths: paths:
- target/release/parity - target/release/parity
- target/release/parity/evmbin - target/release/parity-evm
- target/release/parity/ethstore - target/release/ethstore
- target/release/parity/ethkey - target/release/ethkey
name: "stable-x86_64-unknown-linux-gnu_parity" name: "stable-x86_64-unknown-linux-gnu_parity"
linux-stable-debian: linux-stable-debian:
stage: build stage: build
@ -73,14 +73,14 @@ linux-stable-debian:
- cargo build -j $(nproc) --release -p ethstore - cargo build -j $(nproc) --release -p ethstore
- cargo build -j $(nproc) --release -p ethkey - cargo build -j $(nproc) --release -p ethkey
- strip target/release/parity - strip target/release/parity
- strip target/release/evm - strip target/release/parity-evm
- strip target/release/ethstore - strip target/release/ethstore
- strip target/release/ethkey - strip target/release/ethkey
- export SHA3=$(target/release/parity tools hash target/release/parity) - export SHA3=$(target/release/parity tools hash target/release/parity)
- md5sum target/release/parity > parity.md5 - md5sum target/release/parity > parity.md5
- sh scripts/deb-build.sh amd64 - sh scripts/deb-build.sh amd64
- cp target/release/parity deb/usr/bin/parity - cp target/release/parity deb/usr/bin/parity
- cp target/release/evm deb/usr/bin/evm - cp target/release/parity-evm deb/usr/bin/parity-evm
- cp target/release/ethstore deb/usr/bin/ethstore - cp target/release/ethstore deb/usr/bin/ethstore
- cp target/release/ethkey deb/usr/bin/ethkey - cp target/release/ethkey deb/usr/bin/ethkey
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n") - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
@ -503,7 +503,7 @@ docker-build:
- sh scripts/docker-build.sh $DOCKER_TAG - sh scripts/docker-build.sh $DOCKER_TAG
tags: tags:
- docker - docker
test-coverage: test-coverage:
stage: test stage: test
only: only:
- coverage - coverage
@ -511,7 +511,7 @@ test-coverage:
- git submodule update --init --recursive - git submodule update --init --recursive
- scripts/cov.sh - scripts/cov.sh
- COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/kcov/index.json | grep "[0-9]*\.[0-9]" -o) - COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/kcov/index.json | grep "[0-9]*\.[0-9]" -o)
- echo "Coverage:" $COVERAGE - echo "Coverage:" $COVERAGE
tags: tags:
- kcov - kcov
allow_failure: true allow_failure: true

View File

@ -5,11 +5,11 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
[lib] [lib]
name = "evm" name = "evmbin"
path = "./src/main.rs" path = "./src/main.rs"
[[bin]] [[bin]]
name = "evm" name = "parity-evm"
path = "./src/main.rs" path = "./src/main.rs"
[dependencies] [dependencies]