Merge remote-tracking branch 'upstream/master' into runtime_codegen

paritytech · Feb 3, 2023 · 6fca6d1 · 6fca6d1
2 parents 29006e5 + 86662f2
commit 6fca6d1
Show file tree

Hide file tree

Showing 37 changed files with 333 additions and 189 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,21 +5,24 @@ stages:
   - build
   - publish
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-variables:                         &default-vars
+variables:
   GIT_STRATEGY:                    fetch
   GIT_DEPTH:                       100
   CARGO_INCREMENTAL:               0
   ARCH:                            "x86_64"
   CI_IMAGE:                        "paritytech/bridges-ci:production"
+  BUILDAH_IMAGE:                   "quay.io/buildah/stable:v1.27"
   RUST_BACKTRACE:                  full
 
 default:
   cache:                           {}
+  interruptible:                   true
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
 
 .collect-artifacts:                &collect-artifacts
   artifacts:
@@ -32,7 +35,6 @@ default:
 .kubernetes-build:                 &kubernetes-build
   tags:
     - kubernetes-parity-build
-  interruptible:                   true
 
 .docker-env:                       &docker-env
   image:                           "${CI_IMAGE}"
@@ -41,16 +43,8 @@ default:
     - cargo --version
     - rustup +nightly show
     - cargo +nightly --version
-    - sccache -s
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  interruptible:                   true
   tags:
-    - linux-docker
+    - linux-docker-vm-c2
 
 .test-refs:                        &test-refs
   rules:
@@ -197,6 +191,15 @@ benchmarks-test:
   # we may live with failing benchmarks, it is just a signal for us
   allow_failure:                   true
 
+partial-repo-build-test:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *nightly-test
+  script:
+    - ./scripts/verify-pallets-build.sh --no-revert
+  # we may live with failing partial repo build, it is just a signal for us
+  allow_failure:                   true
+
 #### stage:                        build
 
 build:
@@ -237,7 +240,7 @@ build-nightly:
 
 .build-push-image:                 &build-push-image
   <<:                              *kubernetes-build
-  image:                           quay.io/buildah/stable:v1.27
+  image:                           $BUILDAH_IMAGE
   <<:                              *build-refs
   variables:                       &image-variables
     GIT_STRATEGY:                  none
@@ -248,7 +251,7 @@ build-nightly:
   needs:
     - job:                         build
       artifacts:                   true
-  before_script:                   &check-versions
+  before_script:
     - echo "Starting docker image build/push with name '${IMAGE_NAME}' for '${BRIDGES_PROJECT}' with Dockerfile = '${DOCKERFILE}'"
     - if [[ "${CI_COMMIT_TAG}" ]]; then
         VERSION=${CI_COMMIT_TAG};

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/millau/node/Cargo.toml b/bin/millau/node/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-clap = { version = "4.1.3", features = ["derive"] }
+clap = { version = "4.1.4", features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 serde_json = "1.0.79"
 

diff --git a/bin/rialto-parachain/node/Cargo.toml b/bin/rialto-parachain/node/Cargo.toml
@@ -17,7 +17,7 @@ default = []
 runtime-benchmarks = ['rialto-parachain-runtime/runtime-benchmarks']
 
 [dependencies]
-clap = { version = "4.1.3", features = ["derive"] }
+clap = { version = "4.1.4", features = ["derive"] }
 log = '0.4.17'
 codec = { package = 'parity-scale-codec', version = '3.1.5' }
 serde = { version = '1.0', features = ['derive'] }

diff --git a/bin/rialto/node/Cargo.toml b/bin/rialto/node/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/paritytech/parity-bridges-common/"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]
-clap = { version = "4.1.3", features = ["derive"] }
+clap = { version = "4.1.4", features = ["derive"] }
 serde_json = "1.0.79"
 
 # Bridge dependencies

diff --git a/bin/runtime-common/Cargo.toml b/bin/runtime-common/Cargo.toml
@@ -83,6 +83,7 @@ runtime-benchmarks = [
 	"pallet-bridge-grandpa/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-bridge-parachains/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 ]
 integrity-test = [