From 064d27b900f3bbaefbe6aaca9912aaa22a784a64 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 5 Mar 2024 16:54:20 +0000 Subject: [PATCH 1/4] Specify packages individually --- release-please-config.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index 09f9e248f7e..fde2e64dfe7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -21,6 +21,16 @@ "component": "aztec-packages", "package-name": "aztec-packages" }, + "yarn-project/cli": { + "release-type": "node", + "component": "aztec-cli", + "package-name": "aztec-cli" + }, + "yarn-project/aztec": { + "release-type": "node", + "component": "aztec-package", + "package-name": "aztec-package" + }, "barretenberg/ts": { "release-type": "node", "package-name": "barretenberg.js", @@ -37,7 +47,7 @@ { "type": "linked-versions", "groupName": "aztec-packages", - "components": ["barretenberg", "barretenberg.js", "aztec-packages"] + "components": ["barretenberg", "barretenberg.js", "aztec-package", "aztec-cli"] }, "sentence-case" ] From 3c0f6fe7382d1913e9cee23427c3b54a8e5c151b Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 5 Mar 2024 16:56:29 +0000 Subject: [PATCH 2/4] Fix --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index fde2e64dfe7..30e09430110 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -47,7 +47,7 @@ { "type": "linked-versions", "groupName": "aztec-packages", - "components": ["barretenberg", "barretenberg.js", "aztec-package", "aztec-cli"] + "components": ["barretenberg", "barretenberg.js", "aztec-packages", "aztec-package", "aztec-cli"] }, "sentence-case" ] From 9d131ccc4ac8d9163131a622e70fafa5d5602e0b Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 5 Mar 2024 17:24:26 +0000 Subject: [PATCH 3/4] WIP --- .release-please-manifest.json | 2 ++ release-please-config.json | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 41d34975567..07c5df16b15 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,7 @@ { ".": "0.25.0", + "yarn-project/cli": "0.25.0", + "yarn-project/aztec": "0.25.0", "barretenberg": "0.25.0", "barretenberg/ts": "0.25.0" } diff --git a/release-please-config.json b/release-please-config.json index 30e09430110..7cf01cd694f 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -23,13 +23,11 @@ }, "yarn-project/cli": { "release-type": "node", - "component": "aztec-cli", - "package-name": "aztec-cli" + "component": "aztec-cli" }, "yarn-project/aztec": { "release-type": "node", - "component": "aztec-package", - "package-name": "aztec-package" + "component": "aztec-package" }, "barretenberg/ts": { "release-type": "node", @@ -44,6 +42,9 @@ } }, "plugins": [ + { + "type": "node-workspace" + }, { "type": "linked-versions", "groupName": "aztec-packages", From 7dc742d160f7c99156c42a5a2a85675da15dc988 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 5 Mar 2024 17:50:03 +0000 Subject: [PATCH 4/4] Remove version package script --- yarn-project/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/Dockerfile b/yarn-project/Dockerfile index c7c30f83ada..fcedd17ff18 100644 --- a/yarn-project/Dockerfile +++ b/yarn-project/Dockerfile @@ -31,8 +31,8 @@ RUN yarn workspaces focus @aztec/cli @aztec/aztec --production && yarn cache cle # TODO: Use release-please to update package.json directly, and remove this! # It's here to ensure the image rebuilds if the commit tag changes (as the content hash won't). -ARG COMMIT_TAG="" -RUN ./scripts/version_packages.sh +# ARG COMMIT_TAG="" +# RUN ./scripts/version_packages.sh # We no longer need nargo etc. RUN rm -rf /usr/src/noir/noir-repo /usr/src/noir-projects /usr/src/l1-contracts