Unverified Commit e7ab3412 authored by Denis_P's avatar Denis_P 👙 Committed by GitHub

Merge pull request #6 from TriplEight/conflicting_change2

adding another conflict
parents 41e95007 39df7fd0
Pipeline #74020 passed with stages
in 3 minutes and 50 seconds
......@@ -61,7 +61,7 @@ variables:
#### stage: check
check-std:
check-std2:
stage: check
<<: *docker-env
script:
......@@ -80,11 +80,11 @@ check-wasm:
#### stage: workspace
clippy-std:
clippy-std2:
stage: workspace
<<: *docker-env
needs:
- check-std
- check-std2
script:
- for crate in ${ALL_CRATES}; do
cargo clippy --verbose --all-features --manifest-path ${crate}/Cargo.toml -- -D warnings;
......@@ -97,7 +97,7 @@ clippy-std:
- cargo install --git https://github.com/paritytech/cargo-contract || echo $?
- cargo contract -V
examples-fmt:
examples-fmt2:
stage: examples
<<: *docker-env
script:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment