Experiment with CI

use-ink · Feb 16, 2022 · e76bce7 · e76bce7
1 parent 9825836
commit e76bce7
Show file tree

Hide file tree

Showing 16 changed files with 4,893 additions and 66 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -50,6 +50,9 @@ jobs:
         run: |
           wasm-opt --version
           cargo -vV
+          cargo install cargo-dylint dylint-link
+          cargo dylint --version
+          rustup component add rust-src
           cargo run -- contract --version
           cargo run -- contract new foobar
           echo "[workspace]" >> foobar/Cargo.toml

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -53,6 +53,9 @@ jobs:
         run: |
           wasm-opt --version
           cargo -vV
+          cargo install cargo-dylint dylint-link
+          cargo dylint --version
+          rustup component add rust-src
           cargo run -- contract --version
           cargo run -- contract new foobar
           echo "[workspace]" >> foobar/Cargo.toml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,7 +6,6 @@
 
 
 stages:
-  - check
   - test
   - build
 
@@ -39,11 +38,20 @@ workflow:
     - cargo -vV
     - rustc -vV
     - rustup show
+    - cargo dylint --version
     - bash --version
     - ./scripts/ci/pre_cache.sh
     # global RUSTFLAGS overrides the linker args so this way is better to pass the flags
     - printf '[build]\nrustflags = ["-C", "link-dead-code"]\n' > ${CARGO_HOME}/config
     - sccache -s
+    - unset RUSTC_WRAPPER
+    #- unset CARGO_TARGET_DIR
+    #- unset CARGO_HOME
+    - rustup component add rustfmt
+    - rustup component add clippy
+    - rustup component add rust-src rustc-dev llvm-tools-preview
+    - clang --version
+    - cc --version
     - git show
   rules:
     - if: $CI_PIPELINE_SOURCE == "web"
@@ -64,28 +72,29 @@ workflow:
     - linux-docker
 
 
-#### stage:                        check
-# be aware that the used image has cargo-contract installed
+#### stage:                        test (all features)
 
-fmt:
-  stage:                           check
+test-dylint:
+  stage:                           test
   <<:                              *docker-env
   script:
+    - cd dylint/
+    - rustup component add rustfmt
+    - rustup component add clippy
+    - rustup component add rust-src rustc-dev llvm-tools-preview
+    - git show
+    - cargo check --verbose
     - cargo fmt --verbose --all -- --check
+    - cargo clippy --verbose -- -D warnings;
+    - RUSTC_WRAPPER="" cargo test --verbose --workspace --all-features
 
-clippy:
-  stage:                           check
-  <<:                              *docker-env
-  script:
-    - cargo clippy --verbose --all-targets --all-features -- -D warnings;
-
-#### stage:                        test (all features)
 
 test:
   stage:                           test
   <<:                              *docker-env
   script:
-    - cargo test --verbose --workspace --all-features
+    #- rm -rf /ci-cache/cargo-contract/targets/431/test/
+    - RUST_LOG=info cargo test --jobs 1 --verbose --workspace --all-features -- --nocapture --test-threads=1
 
 test-new-project-template:
   stage:                           test
@@ -97,6 +106,7 @@ test-new-project-template:
     # `error: current package believes it's in a workspace when it's not`
     - echo "[workspace]" >> new_project/Cargo.toml
 
+    - cargo run --all-features -- contract build --manifest-path new_project/Cargo.toml
     - cargo run --all-features -- contract build --manifest-path new_project/Cargo.toml
     - cargo run --all-features -- contract check --manifest-path new_project/Cargo.toml
     - cargo run --all-features -- contract test --manifest-path new_project/Cargo.toml
@@ -107,17 +117,6 @@ test-new-project-template:
     - cargo fmt --verbose --all -- --check
     - cargo clippy --verbose --manifest-path Cargo.toml -- -D warnings;
 
-test-dylint:
-  stage:                           test
-  <<:                              *docker-env
-  script:
-    - cd dylint/
-    - cargo check --verbose
-    - cargo fmt --verbose --all -- --check
-    - cargo clippy --verbose -- -D warnings;
-    - cargo test --verbose --workspace --all-features
-
-
 #### stage:                        build (default features)
 
 build: