Skip to content

Sccache, needs, CLI update #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TriplEight merged 28 commits into from
Nov 28, 2019
+16 −6
Merged

Sccache, needs, CLI update #277

Changes from 9 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
545e27c
cli is built and sent to examples; cleanup CI
TriplEight Nov 25, 2019
6579c50
fix artifact location
TriplEight Nov 25, 2019
d1f503b
fix script
TriplEight Nov 25, 2019
ccc0f24
'install' cargo-contract
TriplEight Nov 25, 2019
af6e935
save before merge
TriplEight Nov 25, 2019
3355bae
Merge branch 'master' into cli_installation
TriplEight Nov 25, 2019
a591b0a
GIT_DEPTH and some hackery
TriplEight Nov 25, 2019
2b7f141
typo
TriplEight Nov 25, 2019
daa097c
fix artifacts
TriplEight Nov 25, 2019
573ca9f
test
TriplEight Nov 25, 2019
f354a68
test2
TriplEight Nov 25, 2019
f7d2eaa
test3
TriplEight Nov 25, 2019
e1b2b29
build contract from it's repo
TriplEight Nov 26, 2019
4ec3704
typo
TriplEight Nov 26, 2019
d973450
fix build
TriplEight Nov 26, 2019
4ed97a2
build won't work inside git repo. Install --root ftw
TriplEight Nov 26, 2019
d82e641
fix build
TriplEight Nov 26, 2019
f35d194
fix build n
TriplEight Nov 26, 2019
c58963d
fix artifacts
TriplEight Nov 26, 2019
9535bf7
cleanup and ready to go
TriplEight Nov 26, 2019
6a251ba
contract is returned to dockerfile
TriplEight Nov 28, 2019
fe1bb8e
Merge branch 'master' into cli_installation
TriplEight Nov 28, 2019
9bb069f
cargo install should have not given error when version matches
TriplEight Nov 28, 2019
cf8fd17
Merge branch 'cli_installation' of github.com:paritytech/ink into cli…
TriplEight Nov 28, 2019
9c2564d
comment, anchor
TriplEight Nov 28, 2019
bd6744c
typo
TriplEight Nov 28, 2019
e7fb740
Merge branch 'master' into cli_installation
TriplEight Nov 28, 2019
67dcf56
less dupes
TriplEight Nov 28, 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
50 changes: 45 additions & 5 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ stages:

variables:
GIT_STRATEGY: fetch
GIT_DEPTH: "3"
Comment thread
Robbepop marked this conversation as resolved.
CARGO_HOME: "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
SCCACHE_DIR: "/ci-cache/${CI_PROJECT_NAME}/sccache"
Comment thread
Robbepop marked this conversation as resolved.
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -44,6 +45,8 @@ variables:
- schedules
- web
- /^[0-9]+$/ # PRs
dependencies: []
Comment thread
Robbepop marked this conversation as resolved.
interruptible: true
retry:
max: 2
when:
Expand Down Expand Up @@ -72,12 +75,35 @@ check-wasm:
cargo check --verbose --no-default-features --target wasm32-unknown-unknown --manifest-path ${crate}/Cargo.toml;
done

build-cli:
stage: check
<<: *docker-env
script:
# - cargo build --manifest-path cli/Cargo.toml --release
- cargo install --git https://github.com/paritytech/cargo-contract --force
Comment thread
TriplEight marked this conversation as resolved.
Outdated
# - git clone --depth 1 https://github.com/paritytech/cargo-contract
# - pushd cargo-contract
# - cargo build --manifest-path cli/Cargo.toml --release
# - popd
# - ./target/release/cargo-contract -V
- which cargo-contract
- mkdir -p ./artifacts/
- cp $(which cargo-contract) ./artifacts/
artifacts:
name: cli_${CI_COMMIT_SHORT_SHA}
expire_in: 24 hrs
Comment thread
TriplEight marked this conversation as resolved.
Outdated
paths:
# - ./target/release/cargo-contract
# - /usr/local/cargo/bin/cargo-contract
- artifacts/


#### stage: workspace

build-std:
stage: workspace
<<: *docker-env
dependencies:
needs:
- check-std
script:
- for crate in ${ALL_CRATES}; do
Expand All @@ -87,7 +113,7 @@ build-std:
build-wasm:
stage: workspace
<<: *docker-env
dependencies:
needs:
- check-wasm
script:
- for crate in ${ALL_CRATES}; do
Expand All @@ -97,7 +123,7 @@ build-wasm:
test:
stage: workspace
<<: *docker-env
dependencies:
needs:
- check-std
script:
- for crate in ${ALL_CRATES}; do
Expand All @@ -107,7 +133,7 @@ test:
clippy-std:
stage: workspace
<<: *docker-env
dependencies:
needs:
- check-std
script:
- for crate in ${ALL_CRATES}; do
Expand All @@ -117,7 +143,7 @@ clippy-std:
clippy-wasm:
stage: workspace
<<: *docker-env
dependencies:
needs:
- check-wasm
script:
- for crate in ${ALL_CRATES}; do
Expand Down Expand Up @@ -168,7 +194,14 @@ examples-clippy-wasm:
examples-contract-build:
stage: examples
<<: *docker-env
dependencies:
- build-cli
needs:
- build-cli
Comment thread
Robbepop marked this conversation as resolved.
Outdated
script:
# - cp target/release/cargo-contract /usr/local/cargo/bin/
- cp artifacts/cargo-contract /usr/local/cargo/bin/
- cargo contract -V
- for example in examples/lang2/*; do
pushd $example &&
cargo contract build &&
Expand All @@ -178,7 +211,14 @@ examples-contract-build:
examples-generate-metadata:
stage: examples
<<: *docker-env
dependencies:
- build-cli
needs:
- build-cli
script:
# - cp target/release/cargo-contract /usr/local/cargo/bin/
- cp artifacts/cargo-contract /usr/local/cargo/bin/
- cargo contract -V
- for example in examples/lang2/*; do
pushd $example &&
cargo contract generate-metadata &&
Expand Down