Merge branch 'master' into rb-claim-commission-other

paritytech · Nov 25, 2023 · d990e1d · d990e1d
2 parents 1af86b7 + ffc64fd
commit d990e1d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/.github/review-bot.yml b/.github/review-bot.yml
@@ -9,7 +9,7 @@ rules:
         - ^\.config/nextest.toml
         - ^\.cargo/.*
       exclude: 
-        - ^./gitlab/pipeline/zombienet.*
+        - ^\.gitlab/pipeline/zombienet.*
     minApprovals: 2
     type: basic
     teams:

diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml
@@ -1,7 +1,7 @@
 .zombienet-refs:
   extends: .build-refs
   variables:
-    ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.82"
+    ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.83"
 
 include:
   # substrate tests

diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -27,6 +27,8 @@
   needs:
     - job: build-push-image-test-parachain
       artifacts: true
+    - job: build-push-image-polkadot-debug
+      artifacts: true
   variables:
     POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:${DOCKER_IMAGES_VERSION}"
     GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet/tests"

diff --git a/cumulus/client/cli/src/lib.rs b/cumulus/client/cli/src/lib.rs
@@ -215,6 +215,13 @@ impl sc_cli::CliConfiguration for ExportGenesisStateCommand {
 	fn shared_params(&self) -> &sc_cli::SharedParams {
 		&self.shared_params
 	}
+
+	fn base_path(&self) -> sc_cli::Result<Option<BasePath>> {
+		// As we are just exporting the genesis wasm a tmp database is enough.
+		//
+		// As otherwise we may "pollute" the global base path.
+		Ok(Some(BasePath::new_temp_dir()?))
+	}
 }
 
 /// Command for exporting the genesis wasm file.
@@ -266,6 +273,13 @@ impl sc_cli::CliConfiguration for ExportGenesisWasmCommand {
 	fn shared_params(&self) -> &sc_cli::SharedParams {
 		&self.shared_params
 	}
+
+	fn base_path(&self) -> sc_cli::Result<Option<BasePath>> {
+		// As we are just exporting the genesis wasm a tmp database is enough.
+		//
+		// As otherwise we may "pollute" the global base path.
+		Ok(Some(BasePath::new_temp_dir()?))
+	}
 }
 
 fn validate_relay_chain_url(arg: &str) -> Result<Url, String> {