From 949069703a618549641f623c17a708d1b3daa681 Mon Sep 17 00:00:00 2001 From: joao-paulo-parity Date: Mon, 14 Nov 2022 23:51:03 -0300 Subject: [PATCH 1/3] fix `cargo check` for pallet-contracts-proc-macro --- frame/contracts/proc-macro/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frame/contracts/proc-macro/Cargo.toml b/frame/contracts/proc-macro/Cargo.toml index aca1d86ac24a1..08dafcc6a8fca 100644 --- a/frame/contracts/proc-macro/Cargo.toml +++ b/frame/contracts/proc-macro/Cargo.toml @@ -17,7 +17,7 @@ proc-macro = true [dependencies] proc-macro2 = "1" quote = "1" -syn = "1.0.98" +syn = { version = "1.0.98", features = ["full"] } [dev-dependencies] From 2bf9534ea616f5d9f4c875cce32312d1e5e79c56 Mon Sep 17 00:00:00 2001 From: joao-paulo-parity Date: Mon, 14 Nov 2022 23:52:20 -0300 Subject: [PATCH 2/3] add test for cargo-check of pallet-contracts-proc-macro --- scripts/ci/gitlab/pipeline/test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml index 710fbe6227f46..62aba380fa7a6 100644 --- a/scripts/ci/gitlab/pipeline/test.yml +++ b/scripts/ci/gitlab/pipeline/test.yml @@ -145,6 +145,17 @@ cargo-check-subkey: - SKIP_WASM_BUILD=1 time cargo check --locked --release - rusty-cachier cache upload +cargo-check-contracts-proc-macro: + stage: test + extends: + - .docker-env + - .test-refs + script: + - rusty-cachier snapshot create + - cd ./frame/contracts/proc-macro + - SKIP_WASM_BUILD=1 time cargo check --locked --release + - rusty-cachier cache upload + cargo-check-try-runtime: stage: test # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs From 26013e7516b004196e2f29ae26845bc2abc01d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Silva=20de=20Souza?= <77391175+joao-paulo-parity@users.noreply.github.com> Date: Tue, 15 Nov 2022 10:29:51 -0300 Subject: [PATCH 3/3] remove cargo-check-contracts-proc-macro https://github.com/paritytech/substrate/pull/12706/files#r1022783937 --- scripts/ci/gitlab/pipeline/test.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml index 62aba380fa7a6..710fbe6227f46 100644 --- a/scripts/ci/gitlab/pipeline/test.yml +++ b/scripts/ci/gitlab/pipeline/test.yml @@ -145,17 +145,6 @@ cargo-check-subkey: - SKIP_WASM_BUILD=1 time cargo check --locked --release - rusty-cachier cache upload -cargo-check-contracts-proc-macro: - stage: test - extends: - - .docker-env - - .test-refs - script: - - rusty-cachier snapshot create - - cd ./frame/contracts/proc-macro - - SKIP_WASM_BUILD=1 time cargo check --locked --release - - rusty-cachier cache upload - cargo-check-try-runtime: stage: test # this is an artificial job dependency, for pipeline optimization using GitLab's DAGs