Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

less dupes, cleanup #4491

Merged
bkchr merged 2 commits into from
Dec 28, 2019
Merged

less dupes, cleanup #4491

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0997135
build node job is separated from build substrate; less dupes, cleanup
TriplEight Dec 24, 2019
c877688
it's not effective yet to split these jobs
TriplEight Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ test-linux-stable: &test-linux
paths:
- ${CI_COMMIT_SHORT_SHA}_warnings.log

test-dependency-rules: &test-linux
test-dependency-rules:
stage: test
<<: *docker-env
except:
Expand All @@ -159,7 +159,7 @@ test-dependency-rules: &test-linux
script:
- .maintain/ensure-deps.sh

test-frame-staking: &test-frame-staking
test-frame-staking:
stage: test
<<: *docker-env
variables:
Expand All @@ -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
- sccache -s

test-wasmtime: &test-wasmtime
test-wasmtime:
stage: test
<<: *docker-env
variables:
Expand Down Expand Up @@ -244,7 +244,7 @@ node-exits:
- ./.maintain/check_for_exit.sh


test-full-crypto-feature: &test-full-crypto-feature
test-full-crypto-feature:
stage: test
<<: *docker-env
variables:
Expand All @@ -265,17 +265,18 @@ test-full-crypto-feature: &test-full-crypto-feature

#### stage: build

build-linux-substrate:
build-linux-substrate: &build-binary
stage: build
<<: *collect-artifacts
<<: *docker-env
<<: *build-only
before_script:
- mkdir -p ./artifacts/substrate/
except:
variables:
- $DEPLOY_TAG
script:
- WASM_BUILD_NO_COLOR=1 time cargo build --release --verbose
- mkdir -p ./artifacts/substrate/
- mv ./target/release/substrate ./artifacts/substrate/.
- echo -n "Substrate version = "
- if [ "${CI_COMMIT_TAG}" ]; then
Expand All @@ -286,25 +287,23 @@ build-linux-substrate:
tee ./artifacts/substrate/VERSION;
fi
- sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256
- printf '\n# building node-template\n\n'
- ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz
- cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/
- sccache -s

build-linux-node-template:
<<: *build-binary
script:
- ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz
- cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/
Copy link
Member

@bkchr bkchr Dec 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we do this here? And not in the build substrate job above?

Copy link
Contributor Author

@TriplEight TriplEight Dec 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, right now it's not effective to split these jobs

Copy link
Contributor Author

@TriplEight TriplEight Dec 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, we are compiling it right there: https://gitlab.parity.io/parity/substrate/-/jobs/339822#L706 , during cargo build.
Can we use that artifact?

Copy link
Member

@bkchr bkchr Dec 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was speaking about the docker file. Putting the node template into its own job sounds reasonable.

- sccache -s

build-linux-subkey:
stage: build
<<: *collect-artifacts
<<: *docker-env
<<: *build-only
except:
variables:
- $DEPLOY_TAG
<<: *build-binary
before_script:
- mkdir -p ./artifacts/subkey
script:
- cd ./bin/utils/subkey
- BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose
- cd -
- sccache -s
- mkdir -p ./artifacts/subkey
- mv ./target/release/subkey ./artifacts/subkey/.
- echo -n "Subkey version = "
- ./artifacts/subkey/subkey --version |
Expand Down