From 0b2b6e35ecee59aa3fe1c22618bc5e46c0806bd7 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 7f625f621..570556d45 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -10,11 +10,19 @@ license = "Apache-2.0" [package.metadata.release] 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 54fcc7a2c98714a0699be1b508c1072db2d99525 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 570556d45..792d6fc3b 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -20,9 +20,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 717061095cc18ce979fe63b46892668cd3c44c56 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 ce4e3da10e045119f5b6b22cd8caadb70356568a 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 792d6fc3b..99f369028 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -20,12 +20,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 5b6d091293e060cf9040a5503167f26cf5c4c81a Mon Sep 17 00:00:00 2001 From: Christoph Otter Date: Mon, 16 Dec 2024 12:01:21 +0100 Subject: [PATCH 5/5] Fix conflict --- packages/vm/Cargo.toml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml index 99f369028..a8e53729d 100644 --- a/packages/vm/Cargo.toml +++ b/packages/vm/Cargo.toml @@ -10,27 +10,11 @@ license = "Apache-2.0" [package.metadata.release] 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] @@ -70,11 +54,17 @@ cosmwasm-crypto = { path = "../crypto", version = "1.5.9" } derivative = "2" hex = "0.4" schemars = "0.8.3" -serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] } +serde = { version = "1.0.103", default-features = false, features = [ + "derive", + "alloc", +] } serde_json = "1.0.40" sha2 = "0.10.3" thiserror = "1.0.26" -wasmer = { version = "=4.2.2", default-features = false, features = ["cranelift", "singlepass"] } +wasmer = { version = "=4.2.2", default-features = false, features = [ + "cranelift", + "singlepass", +] } wasmer-types = "=4.2.2" wasmer-middlewares = "=4.2.2"