Merge branch 'master' of https://github.com/paritytech/parity into ao…

…-fix-windows

* 'master' of https://github.com/paritytech/parity:
  while working on the platform tests make them non-breaking (openethereum#9563)
  Improve P2P discovery (openethereum#9526)
  move dockerfile for android build container to scripts repo (openethereum#9560)
  Simultaneous platform tests WIP (openethereum#9557)

.gitlab-ci.yml

@@ -49,32 +49,75 @@ cache:
   - export VERSION
   - echo "Version = ${VERSION}"
 
-
-
 #### stage:                        test
 
-test-rust-stable:                  &test
+test-linux-rust-stable:            &test
   stage:                           test
   script:
     - scripts/gitlab/test.sh stable
   tags:
     - rust-stable
 
-.optional_test:                    &optional_test
-  <<:                              *test
-  allow_failure:                   true
-  only:
-    - master
-
-test-rust-beta:
-  <<:                              *optional_test
+test-linux-rust-beta:
+  stage:                           test
   script:
     - scripts/gitlab/test.sh beta
+  tags:
+    - rust-stable
+  allow_failure:                   true
 
-test-rust-nightly:
-  <<:                              *optional_test
+test-linux-rust-nightly:
+  stage:                           test
   script:
     - scripts/gitlab/test.sh nightly
+  tags:
+    - rust-stable
+  allow_failure:                   true
+
+test-darwin-rust-stable:
+  stage:                           test
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
+  script:
+    - scripts/gitlab/test.sh stable
+  tags:
+    - osx
+  allow_failure:                   true
+
+test-android-rust-stable:
+  stage:                           test
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/test.sh stable
+  tags:
+    - rust-arm
+  allow_failure:                   true
+
+test-windows-rust-stable:
+  stage:                           test
+  cache:
+    key:                           "%CI_JOB_NAME%"
+    paths:
+      - "%CI_PROJECT_DIR%/target/"
+      - "%CI_PROJECT_DIR%/cargo/"
+      # No cargo caching, since fetch-locking on Windows gets stuck
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+  script:
+    - sh scripts/gitlab/test.sh stable
+  tags:
+   - rust-windows
+  allow_failure:                   true
+
+.optional_test:                    &optional_test
+  <<:                              *test
+  allow_failure:                   true
+  only:
+    - master
 
 test-lint-rustfmt:
   <<:                             *optional_test
@@ -87,15 +130,11 @@ test-lint-clippy:
     - scripts/gitlab/clippy.sh
 
 test-coverage-kcov:
-  stage:                           test
-  only:
-    - master
+  <<:                             *optional_test
   script:
     - scripts/gitlab/coverage.sh
   tags:
     - shell
-  allow_failure:                   true
-
 
 #### stage:                        build
 
@@ -118,6 +157,7 @@ build-linux-ubuntu-i386:
     CARGO_TARGET:                  i686-unknown-linux-gnu
   tags:
     - rust-i686
+  allow_failure:                   true
 
 build-linux-ubuntu-arm64:
   <<:                              *build
@@ -127,6 +167,7 @@ build-linux-ubuntu-arm64:
     CARGO_TARGET:                  aarch64-unknown-linux-gnu
   tags:
     - rust-arm
+  allow_failure:                   true
 
 build-linux-ubuntu-armhf:
   <<:                              *build
@@ -136,19 +177,23 @@ build-linux-ubuntu-armhf:
     CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
   tags:
     - rust-arm
+  allow_failure:                   true
 
 build-linux-android-armhf:
   stage:                           build
+  only:                            *releaseable_branches
   image:                           parity/rust-android:gitlab-ci
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
   script:
     - scripts/gitlab/build-unix.sh
   tags:
     - rust-arm
+  allow_failure:                   true
 
 build-darwin-macos-x86_64:
   stage:                           build
+  only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-apple-darwin
     CC:                            gcc
@@ -161,6 +206,7 @@ build-darwin-macos-x86_64:
 
 build-windows-msvc-x86_64:
   stage:                           build
+  only:                            *releaseable_branches
   cache:
     key:                           "%CI_JOB_NAME%"
     paths:
@@ -175,7 +221,6 @@ build-windows-msvc-x86_64:
    - rust-windows
   <<:                              *collect_artifacts
 
-
 #### stage:                        package
 
 package-linux-snap-amd64:          &package_snap
@@ -217,7 +262,6 @@ package-linux-snap-armhf:
   dependencies:
     - build-linux-ubuntu-armhf
 
-
 #### stage:                        publish
 
 publish-linux-snap-amd64:          &publish_snap
@@ -289,7 +333,6 @@ publish-github-and-s3:
   tags:
     - shell
 
-
 ####stage:                          docs
 
 docs-rpc-json: