From 0daf591ad7af7d687fec13198e877c4a3f9e38e8 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:42:27 +0000
Subject: [PATCH] chore: remove separate acvm versioning (#6561)

---
 .release-please-manifest.json |  3 +--
 release-please-config.json    | 45 ++++++++++++++---------------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 516bf104c15..418b49e9957 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,4 +1,3 @@
 {
-  ".": "0.39.0",
-  "acvm-repo": "0.55.0"
+  ".": "0.39.0"
 }
diff --git a/release-please-config.json b/release-please-config.json
index 88455cfcae1..963f1af26d9 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -15,66 +15,57 @@
       "include-component-in-tag": false,
       "extra-files": [
         "Cargo.toml",
+        "acvm-repo/acir/Cargo.toml",
+        "acvm-repo/acir_field/Cargo.toml",
+        "acvm-repo/acvm/Cargo.toml",
+        "acvm-repo/acvm_js/Cargo.toml",
+        "acvm-repo/blackbox_solver/Cargo.toml",
+        "acvm-repo/bn254_blackbox_solver/Cargo.toml",
+        "acvm-repo/brillig/Cargo.toml",
+        "acvm-repo/brillig_vm/Cargo.toml",
         {
           "type": "json",
-          "path": "compiler/wasm/package.json",
+          "path": "acvm-repo/acvm_js/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "tooling/noir_codegen/package.json",
+          "path": "acvm-repo/acvm_js/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "tooling/noir_js/package.json",
+          "path": "compiler/wasm/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "tooling/noir_js_backend_barretenberg/package.json",
+          "path": "tooling/noir_codegen/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "tooling/noir_js_types/package.json",
+          "path": "tooling/noir_js/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "tooling/noirc_abi_wasm/package.json",
+          "path": "tooling/noir_js_backend_barretenberg/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "docs/docs/package.json",
+          "path": "tooling/noir_js_types/package.json",
           "jsonpath": "$.version"
-        }
-      ]
-    },
-    "acvm-repo": {
-      "release-type": "simple",
-      "versioning": "prerelease",
-      "package-name": "acvm",
-      "component": "acvm",
-      "include-component-in-tag": false,
-      "extra-files": [
-        "acir/Cargo.toml",
-        "acir_field/Cargo.toml",
-        "acvm/Cargo.toml",
-        "acvm_js/Cargo.toml",
-        "blackbox_solver/Cargo.toml",
-        "bn254_blackbox_solver/Cargo.toml",
-        "brillig/Cargo.toml",
-        "brillig_vm/Cargo.toml",
+        },
         {
           "type": "json",
-          "path": "acvm_js/package.json",
+          "path": "tooling/noirc_abi_wasm/package.json",
           "jsonpath": "$.version"
         },
         {
           "type": "json",
-          "path": "acvm_js/package.json",
+          "path": "docs/docs/package.json",
           "jsonpath": "$.version"
         }
       ]