From 75a0905661c50e2573fdfbc6804d47230230c626 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 8 Jan 2020 17:35:39 +0000 Subject: [PATCH 1/5] Add CI badges and update title --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d430f363..997ff700 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Cargo plugin for [`ink!`](https://github.com/paritytech/ink) contracts +# cargo-contract · [![GitHub license](https://img.shields.io/github/license/paritytech/cargo-contract)](LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/cargo-contract/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/cargo-contract/pipelines) + +**Cargo plugin for [`ink!`](https://github.com/paritytech/ink) contracts** **IMPORTANT NOTE:** WORK IN PROGRESS! Do not expect this to be working. -- GitLab From 88ace02a5f8d41bb3a27cfd4ef7dab0290185a3c Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 9 Jan 2020 09:26:51 +0000 Subject: [PATCH 2/5] Revert to original title --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 997ff700..dda99ea5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# cargo-contract · [![GitHub license](https://img.shields.io/github/license/paritytech/cargo-contract)](LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/cargo-contract/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/cargo-contract/pipelines) +# Cargo plugin for [`ink!`](https://github.com/paritytech/ink) contracts -**Cargo plugin for [`ink!`](https://github.com/paritytech/ink) contracts** +[![GitHub license](https://img.shields.io/github/license/paritytech/cargo-contract)](LICENSE) [![GitLab Status](https://gitlab.parity.io/parity/cargo-contract/badges/master/pipeline.svg)](https://gitlab.parity.io/parity/cargo-contract/pipelines) **IMPORTANT NOTE:** WORK IN PROGRESS! Do not expect this to be working. -- GitLab From 413e6340ad2d23390cc59aea7f027adfb612a421 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 9 Jan 2020 10:07:05 +0000 Subject: [PATCH 3/5] Try using different image --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29e6833f..ffeace88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: - artifacts/ .docker-env: &docker-env - image: ${REGISTRY}/ink-ci-linux:latest + image: ${REGISTRY}/rust-builder:latest before_script: - cargo -vV - rustc -vV @@ -72,8 +72,8 @@ test: script: - cargo test --verbose --all-features --release -#### stage: build - +#### stage: build + build: stage: build <<: *docker-env @@ -81,4 +81,4 @@ build: - schedules - master script: - - cargo build --verbose --all-features --release \ No newline at end of file + - cargo build --verbose --all-features --release -- GitLab From 1286f2d6c0d5432c28c3be839b3d8fd14eb761e7 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 9 Jan 2020 10:09:38 +0000 Subject: [PATCH 4/5] Image path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffeace88..1692218b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: - artifacts/ .docker-env: &docker-env - image: ${REGISTRY}/rust-builder:latest + image: parity/rust-builder:latest before_script: - cargo -vV - rustc -vV -- GitLab From 44adbec2d6a559f374ae2930c5974265d0ed2d9d Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 9 Jan 2020 10:13:27 +0000 Subject: [PATCH 5/5] Install rustfmt --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1692218b..417f9404 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,7 @@ fmt: stage: check <<: *docker-env script: + - rustup component add rustfmt - cargo fmt --verbose --all -- --check #### stage: test -- GitLab