fix: merge conflicts

paritytech · May 13, 2019 · 21c00a9 · 21c00a9
2 parents 3076793 + 3eb8895
commit 21c00a9
Show file tree

Hide file tree

Showing 174 changed files with 7,170 additions and 5,013 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 doc
-target
+**target*
 .idea/
 Dockerfile
 .dockerignore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -88,10 +88,20 @@ check-web-wasm:
     - /^[0-9]+$/
   script:
     # WASM support is in progress. As more and more crates support WASM, we
-    # should add entries here.
+    # should add entries here. See https://github.com/paritytech/substrate/issues/2416
+    - time cargo web build -p sr-io
+    - time cargo web build -p sr-primitives
+    - time cargo web build -p sr-std
+    - time cargo web build -p substrate-consensus-common
+    - time cargo web build -p substrate-executor
     - time cargo web build -p substrate-network-libp2p
     - time cargo web build -p substrate-panic-handler
     - time cargo web build -p substrate-peerset
+    - time cargo web build -p substrate-primitives
+    - time cargo web build -p substrate-serializer
+    - time cargo web build -p substrate-state-db
+    - time cargo web build -p substrate-state-machine
+    - time cargo web build -p substrate-trie
 
 .build-only:                      &build-only
   only: