less dupes, cleanup (#4491)

* build node job is separated from build substrate; less dupes, cleanup

* it's not effective yet to split these jobs
This commit is contained in:
Denis Pisarev
2019-12-28 17:00:39 +01:00
committed by Bastian Köcher
parent 885f94dfad
commit 9876d3dd09
+10 -15
View File
@@ -150,7 +150,7 @@ test-linux-stable: &test-linux
paths: paths:
- ${CI_COMMIT_SHORT_SHA}_warnings.log - ${CI_COMMIT_SHORT_SHA}_warnings.log
test-dependency-rules: &test-linux test-dependency-rules:
stage: test stage: test
<<: *docker-env <<: *docker-env
except: except:
@@ -159,7 +159,7 @@ test-dependency-rules: &test-linux
script: script:
- .maintain/ensure-deps.sh - .maintain/ensure-deps.sh
test-frame-staking: &test-frame-staking test-frame-staking:
stage: test stage: test
<<: *docker-env <<: *docker-env
variables: variables:
@@ -175,7 +175,7 @@ test-frame-staking: &test-frame-staking
- WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --no-default-features --features std - WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --no-default-features --features std
- sccache -s - sccache -s
test-wasmtime: &test-wasmtime test-wasmtime:
stage: test stage: test
<<: *docker-env <<: *docker-env
variables: variables:
@@ -244,7 +244,7 @@ node-exits:
- ./.maintain/check_for_exit.sh - ./.maintain/check_for_exit.sh
test-full-crypto-feature: &test-full-crypto-feature test-full-crypto-feature:
stage: test stage: test
<<: *docker-env <<: *docker-env
variables: variables:
@@ -265,17 +265,18 @@ test-full-crypto-feature: &test-full-crypto-feature
#### stage: build #### stage: build
build-linux-substrate: build-linux-substrate: &build-binary
stage: build stage: build
<<: *collect-artifacts <<: *collect-artifacts
<<: *docker-env <<: *docker-env
<<: *build-only <<: *build-only
before_script:
- mkdir -p ./artifacts/substrate/
except: except:
variables: variables:
- $DEPLOY_TAG - $DEPLOY_TAG
script: script:
- WASM_BUILD_NO_COLOR=1 time cargo build --release --verbose - WASM_BUILD_NO_COLOR=1 time cargo build --release --verbose
- mkdir -p ./artifacts/substrate/
- mv ./target/release/substrate ./artifacts/substrate/. - mv ./target/release/substrate ./artifacts/substrate/.
- echo -n "Substrate version = " - echo -n "Substrate version = "
- if [ "${CI_COMMIT_TAG}" ]; then - if [ "${CI_COMMIT_TAG}" ]; then
@@ -292,19 +293,13 @@ build-linux-substrate:
- sccache -s - sccache -s
build-linux-subkey: build-linux-subkey:
stage: build <<: *build-binary
<<: *collect-artifacts before_script:
<<: *docker-env - mkdir -p ./artifacts/subkey
<<: *build-only
except:
variables:
- $DEPLOY_TAG
script: script:
- cd ./bin/utils/subkey - cd ./bin/utils/subkey
- BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose - BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose
- cd - - cd -
- sccache -s
- mkdir -p ./artifacts/subkey
- mv ./target/release/subkey ./artifacts/subkey/. - mv ./target/release/subkey ./artifacts/subkey/.
- echo -n "Subkey version = " - echo -n "Subkey version = "
- ./artifacts/subkey/subkey --version | - ./artifacts/subkey/subkey --version |