Merge branch 'master' into wasm-builder-riscv32emac

paritytech · Dec 3, 2024 · a23fa4e · a23fa4e
2 parents 334b78d + d1d92ab
commit a23fa4e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("westmint"),
 	impl_name: alloc::borrow::Cow::Borrowed("westmint"),
 	authoring_version: 1,
-	spec_version: 1_016_008,
+	spec_version: 1_017_002,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,

diff --git a/prdoc/pr_6583.prdoc b/prdoc/pr_6583.prdoc
@@ -0,0 +1,7 @@
+title: Bump Westend AH
+doc:
+- audience: Runtime Dev
+  description: Bump Asset-Hub westend spec version
+crates:
+- name: asset-hub-westend-runtime
+  bump: minor
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
@@ -204,10 +204,15 @@ fn create_out_dir() -> Result<PathBuf> {
 	.join("pallet-revive-fixtures");
 
 	// clean up some leftover symlink from previous versions of this script
-	if out_dir.exists() && !out_dir.is_dir() {
+	let mut out_exists = out_dir.exists();
+	if out_exists && !out_dir.is_dir() {
 		fs::remove_file(&out_dir)?;
+		out_exists = false;
+	}
+
+	if !out_exists {
+		fs::create_dir(&out_dir).context("Failed to create output directory")?;
 	}
-	fs::create_dir_all(&out_dir).context("Failed to create output directory")?;
 
 	// write the location of the out dir so it can be found later
 	let mut file = fs::File::create(temp_dir.join("fixture_location.rs"))