From eaf70536b0bd4fcf2ee79dace8ceb85e68a8bd4c Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 27 Apr 2022 14:41:34 +0200 Subject: [PATCH 1/3] [ci] Add check shell.nix --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c06f3eb9c8e0..c6d30ab4c1f86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -443,6 +443,17 @@ test-wasmer-sandbox: - time cargo test --release --features runtime-benchmarks,wasmer-sandbox,disable-ui-tests - sccache -s +cargo-check-nixos: + stage: test + <<: *docker-env + <<: *test-refs + variables: + CI_IMAGE: "nixos/nix" + script: + - nix-channel --update + - nix-shell shell-nix + - nix-shell --run "cargo check --workspace --all-targets --all-features" + cargo-check-macos: stage: test # shell runner on mac ignores the image set in *docker-env From 64a867074c839b44ecb83083c997d8b1ea0a0d8a Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 27 Apr 2022 14:45:04 +0200 Subject: [PATCH 2/3] remove before_script --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6d30ab4c1f86..31ac73be85c58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -447,6 +447,7 @@ cargo-check-nixos: stage: test <<: *docker-env <<: *test-refs + before_script: [] variables: CI_IMAGE: "nixos/nix" script: From 6f3f15f5c736cc178aec2d13c74a87a1e15143d8 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 27 Apr 2022 15:00:24 +0200 Subject: [PATCH 3/3] fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31ac73be85c58..396b3b1395262 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -452,7 +452,7 @@ cargo-check-nixos: CI_IMAGE: "nixos/nix" script: - nix-channel --update - - nix-shell shell-nix + - nix-shell shell.nix - nix-shell --run "cargo check --workspace --all-targets --all-features" cargo-check-macos: