Backports for beta 2.1.2

.gitlab-ci.yml

@@ -1,38 +1,30 @@
 stages:
   - test
   - build
-  - package
   - publish
-  - docs
+  - optional
 
 image:                             parity/rust:gitlab-ci
 
 variables:
   CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "${CI_PROJECT_DIR}/cargo"
-
+  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   BUILD_TARGET:                    ubuntu
   BUILD_ARCH:                      amd64
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
 
 cache:
   key:                             "${CI_JOB_NAME}"
   paths:
-    - ${CI_PROJECT_DIR}/target/
-    - ${CI_PROJECT_DIR}/cargo/
+    - ./target
+    - ./.cargo
 
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
   only:                            &releaseable_branches
-    - master
     - stable
     - beta
     - tags
 
-.publishable_branches:             # list of git refs for publishing builds to the "production" locations
-  only:                            &publishable_branches
-    - nightly # Our nightly builds from schedule, on `master`
-    - /^v2.*$/ # Our version tags
-
 .collect_artifacts:                &collect_artifacts
   artifacts:
     name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
@@ -49,57 +41,16 @@ cache:
   - export VERSION
   - echo "Version = ${VERSION}"
 
-
-
-#### stage:                        test
-
-test-rust-stable:                  &test
+test-linux:
   stage:                           test
+  variables:
+    RUN_TESTS:                     all
   script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-stable
 
-.optional_test:                    &optional_test
-  <<:                              *test
-  allow_failure:                   true
-  only:
-    - master
-
-test-rust-beta:
-  <<:                              *optional_test
-  script:
-    - scripts/gitlab/test.sh beta
-
-test-rust-nightly:
-  <<:                              *optional_test
-  script:
-    - scripts/gitlab/test.sh nightly
-
-test-lint-rustfmt:
-  <<:                             *optional_test
-  script:
-    - scripts/gitlab/rustfmt.sh
-
-test-lint-clippy:
-  <<:                             *optional_test
-  script:
-    - scripts/gitlab/clippy.sh
-
-test-coverage-kcov:
-  stage:                           test
-  only:
-    - master
-  script:
-    - scripts/gitlab/coverage.sh
-  tags:
-    - shell
-  allow_failure:                   true
-
-
-#### stage:                        build
-
-build-linux-ubuntu-amd64:          &build
+build-linux:
   stage:                           build
   only:                            *releaseable_branches
   variables:
@@ -109,59 +60,23 @@ build-linux-ubuntu-amd64:          &build
   <<:                              *collect_artifacts
   tags:
     - rust-stable
-  allow_failure: true
-
-build-linux-ubuntu-i386:
-  <<:                              *build
-  image:                           parity/rust-i686:gitlab-ci
-  variables:
-    CARGO_TARGET:                  i686-unknown-linux-gnu
-  tags:
-    - rust-i686
-
-build-linux-ubuntu-arm64:
-  <<:                              *build
-  image:                           parity/rust-arm64:gitlab-ci
-  variables:
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
-  tags:
-    - rust-arm
 
-build-linux-ubuntu-armhf:
-  <<:                              *build
-  image:                           parity/rust-armv7:gitlab-ci
-  variables:
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
-  tags:
-    - rust-arm
-
-build-linux-android-armhf:
-  <<:                              *build
-  image:                           parity/rust-android:gitlab-ci
-  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
-  tags:
-    - rust-arm
-
-build-darwin-macos-x86_64:
-  <<:                              *build
+build-darwin:
+  stage:                           build
+  only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-apple-darwin
     CC:                            gcc
     CXX:                           g++
+  script:
+    - scripts/gitlab/build-unix.sh
   tags:
-    - osx
+    - rust-osx
   <<:                              *collect_artifacts
 
-build-windows-msvc-x86_64:
+build-windows:
   stage:                           build
   only:                            *releaseable_branches
-  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:
@@ -170,132 +85,96 @@ build-windows-msvc-x86_64:
    - rust-windows
   <<:                              *collect_artifacts
 
-
-#### stage:                        package
-
-package-linux-snap-amd64:          &package_snap
-  stage:                           package
+publish-docker:
+  stage:                           publish
   only:                            *releaseable_branches
-  image:                           parity/snapcraft:gitlab-ci
   cache: {}
-  before_script:                   *determine_version
-  variables:
-    CARGO_TARGET:                  x86_64-unknown-linux-gnu
   dependencies:
-    - build-linux-ubuntu-amd64
-  script:
-    - scripts/gitlab/package-snap.sh
+    - build-linux
   tags:
-    - rust-stable
-  <<:                              *collect_artifacts
-
-package-linux-snap-i386:
-  <<:                              *package_snap
-  variables:
-    BUILD_ARCH: i386
-    CARGO_TARGET:                  i686-unknown-linux-gnu
-  dependencies:
-    - build-linux-ubuntu-i386
-
-package-linux-snap-arm64:
-  <<:                              *package_snap
-  variables:
-    BUILD_ARCH: arm64
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
-  dependencies:
-    - build-linux-ubuntu-arm64
-
-package-linux-snap-armhf:
-  <<:                              *package_snap
-  variables:
-    BUILD_ARCH: armhf
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
-  dependencies:
-    - build-linux-ubuntu-armhf
-
-
-#### stage:                        publish
+    - shell
+  script:
+    - scripts/gitlab/publish-docker.sh parity
 
-publish-linux-snap-amd64:          &publish_snap
+publish-awss3:
   stage:                           publish
-  only:                            *publishable_branches
-  image:                           parity/snapcraft:gitlab-ci
+  only:                            *releaseable_branches
   cache: {}
-  before_script:                   *determine_version
-  variables:
-    BUILD_ARCH:                    amd64
   dependencies:
-    - package-linux-snap-amd64
+    - build-linux
+    - build-darwin
+    - build-windows
+  before_script:                   *determine_version
   script:
-    - scripts/gitlab/publish-snap.sh
+    - scripts/gitlab/publish-awss3.sh
   tags:
-    - rust-stable
-
-publish-linux-snap-i386:
-  <<:                              *publish_snap
-  variables:
-    BUILD_ARCH:                    i386
-  dependencies:
-    - package-linux-snap-i386
-
-publish-linux-snap-arm64:
-  <<:                              *publish_snap
-  variables:
-    BUILD_ARCH:                    arm64
-  dependencies:
-    - package-linux-snap-arm64
-
-publish-linux-snap-armhf:
-  <<:                              *publish_snap
-  variables:
-    BUILD_ARCH:                    armhf
-  dependencies:
-    - package-linux-snap-armhf
+    - shell
 
-publish-docker-parity-amd64: &publish_docker
-  stage:                           publish
-  only:                            *releaseable_branches
+docs-jsonrpc:
+  stage:                            optional
+  only:
+    - tags
+  except:
+    - nightly
   cache: {}
-  dependencies:
-    - build-linux-ubuntu-amd64
+  script:
+    - scripts/gitlab/docs-jsonrpc.sh
   tags:
     - shell
-  allow_failure:                   true
+
+cargo-audit:
+  stage:                           optional
   script:
-    - scripts/gitlab/publish-docker.sh parity
+    - scripts/gitlab/cargo-audit.sh
+  tags:
+    - rust-stable
 
-publish-docker-parityevm-amd64:
-  <<:                              *publish_docker
+test-android:
+  stage:                           optional
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
   script:
-    - scripts/gitlab/publish-docker.sh parity-evm
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-arm
 
-publish-github-and-s3:
-  stage:                           publish
-  only:                            *publishable_branches
-  cache: {}
-  dependencies:
-    - build-linux-ubuntu-amd64
-    - build-linux-ubuntu-i386
-    - build-linux-ubuntu-armhf
-    - build-linux-ubuntu-arm64
-    - build-darwin-macos-x86_64
-    - build-windows-msvc-x86_64
-  before_script:                   *determine_version
+test-darwin:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
+    RUN_TESTS:                     cargo
   script:
-    - scripts/gitlab/push.sh
+    - scripts/gitlab/test-all.sh stable
   tags:
-    - shell
-  allow_failure:                   true
+    - rust-osx
 
+test-windows:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    RUN_TESTS:                     cargo
+  script:
+    - sh scripts/gitlab/test-all.sh stable
+  tags:
+   - rust-windows
 
-####stage:                          docs
+test-beta:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh beta
+  tags:
+    - rust-beta
 
-docs-rpc-json:
-  stage: docs
-  only:
-    - tags
-  cache: {}
+test-nightly:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     all
   script:
-    - scripts/gitlab/rpc-docs.sh
+    - scripts/gitlab/test-all.sh nightly
   tags:
-    - shell
+    - rust-nightly