From e054ef46efaf34116cd283aa4a85ea07d87c31a5 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 22 Nov 2024 17:07:39 +0700 Subject: [PATCH 1/5] Fix replacement order (cherry picked from commit 55ee235b12f390b4bf66ba0de1d7e7fe9157b715) # Conflicts: # packages/vm/Cargo.toml --- packages/vm/Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index 4cf7aff17..d9100b492 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -12,11 +12,19 @@ pre-release-hook = [ "../../devtools/release_checks.sh" ] pre-release-replacements = [ +<<<<<<< HEAD { file="../../CHANGELOG.md", search="## \\[Unreleased\\]", replace="## [{{version}}] - {{date}}", exactly=1 }, { file="../../CHANGELOG.md", search="(U|u)nreleased", replace="{{version}}" }, { file="../../CHANGELOG.md", search="", replace="\n\n## [Unreleased]", exactly=1 }, { file="../../CHANGELOG.md", search="\\.\\.\\.HEAD", replace="...{{tag_name}}", exactly=1 }, { file="../../CHANGELOG.md", search="\n", replace="\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly=1 }, +======= + { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 }, + { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" }, + { file = "../../CHANGELOG.md", search = "", replace = "\n\n## [Unreleased]", exactly = 1 }, + { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, + { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, +>>>>>>> 55ee235b (Fix replacement order) ] [features] From 920e0eb1650b5c46e98620f396f5d1cd915c51cb Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:19:40 +0000 Subject: [PATCH 2/5] [autofix.ci] apply automated fixes (cherry picked from commit 38fea3a7a57941603e35eb4743401fd0158a3f8f) # Conflicts: # packages/vm/Cargo.toml --- packages/vm/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index d9100b492..06513ccfd 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -22,9 +22,12 @@ pre-release-replacements = [ { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 }, { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" }, { file = "../../CHANGELOG.md", search = "", replace = "\n\n## [Unreleased]", exactly = 1 }, - { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, +<<<<<<< HEAD >>>>>>> 55ee235b (Fix replacement order) +======= + { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, +>>>>>>> 38fea3a7 ([autofix.ci] apply automated fixes) ] [features] From 33aa9ecdb8c72d758bd0b687b951d982d9ca28f8 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 22 Nov 2024 17:52:50 +0700 Subject: [PATCH 3/5] Disable toml array reordering (cherry picked from commit 09f45bc35bbfe580fefabe0dfd72c362212ef9d7) # Conflicts: # .taplo.toml --- .taplo.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .taplo.toml diff --git a/.taplo.toml b/.taplo.toml new file mode 100644 index 000000000..9b3a9b621 --- /dev/null +++ b/.taplo.toml @@ -0,0 +1,2 @@ +[formatting] +indent_string = " " From 2388aac1e23869c43711db60579a26501cc463b4 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Fri, 22 Nov 2024 17:53:22 +0700 Subject: [PATCH 4/5] Fix replacement order (again) (cherry picked from commit 961abe687052e5c623ba5f6a70194f87222ea232) # Conflicts: # packages/vm/Cargo.toml --- packages/vm/Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index 06513ccfd..ba48ae88b 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -22,12 +22,17 @@ pre-release-replacements = [ { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 }, { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" }, { file = "../../CHANGELOG.md", search = "", replace = "\n\n## [Unreleased]", exactly = 1 }, +<<<<<<< HEAD { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, <<<<<<< HEAD >>>>>>> 55ee235b (Fix replacement order) ======= { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, >>>>>>> 38fea3a7 ([autofix.ci] apply automated fixes) +======= + { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, + { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, +>>>>>>> 961abe68 (Fix replacement order (again)) ] [features] From aeda77c2a5c9463a99d54702573dc716f836e565 Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 16 Dec 2024 12:06:20 +0100 Subject: [PATCH 5/5] Fix conflicts --- packages/vm/Cargo.toml | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index ba48ae88b..52be7ecba 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -8,31 +8,13 @@ repository = "https://github.com/CosmWasm/cosmwasm/tree/main/packages/vm" license = "Apache-2.0" [package.metadata.release] -pre-release-hook = [ - "../../devtools/release_checks.sh" -] +pre-release-hook = ["../../devtools/release_checks.sh"] pre-release-replacements = [ -<<<<<<< HEAD - { file="../../CHANGELOG.md", search="## \\[Unreleased\\]", replace="## [{{version}}] - {{date}}", exactly=1 }, - { file="../../CHANGELOG.md", search="(U|u)nreleased", replace="{{version}}" }, - { file="../../CHANGELOG.md", search="", replace="\n\n## [Unreleased]", exactly=1 }, - { file="../../CHANGELOG.md", search="\\.\\.\\.HEAD", replace="...{{tag_name}}", exactly=1 }, - { file="../../CHANGELOG.md", search="\n", replace="\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly=1 }, -======= { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 }, { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" }, { file = "../../CHANGELOG.md", search = "", replace = "\n\n## [Unreleased]", exactly = 1 }, -<<<<<<< HEAD - { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, -<<<<<<< HEAD ->>>>>>> 55ee235b (Fix replacement order) -======= - { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, ->>>>>>> 38fea3a7 ([autofix.ci] apply automated fixes) -======= { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 }, { file = "../../CHANGELOG.md", search = "\n", replace = "\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 }, ->>>>>>> 961abe68 (Fix replacement order (again)) ] [features] @@ -62,7 +44,9 @@ crc32fast = "1.3.2" bech32 = "0.11.0" # Uses the path when built locally; uses the given version from crates.io when published cosmwasm-core = { version = "2.1.5", path = "../core" } -cosmwasm-std = { version = "2.1.5", path = "../std", default-features = false, features = ["std"] } +cosmwasm-std = { version = "2.1.5", path = "../std", default-features = false, features = [ + "std", +] } cosmwasm-crypto = { version = "2.1.5", path = "../crypto" } derivative = "2" hex = "0.4" @@ -72,7 +56,9 @@ serde = { workspace = true } serde_json = "1.0.40" sha2 = "0.10.3" thiserror = "1.0.26" -wasmer = { version = "=4.3.3", default-features = false, features = ["singlepass"] } +wasmer = { version = "=4.3.3", default-features = false, features = [ + "singlepass", +] } wasmer-middlewares = "=4.3.3" wasmer-types = "=4.3.3" strum = { version = "0.26.2", default-features = false, features = ["derive"] }