From 51ca602ece284bf4fc331446f342e7c40afe8379 Mon Sep 17 00:00:00 2001 From: Charlie Wyse Date: Thu, 30 Jul 2026 10:37:53 -0700 Subject: [PATCH 1/2] updating envd to use release-please --- .release-please-manifest.json | 8 ++++++++ packages/envd/pkg/version.go | 2 +- release-please-config.json | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 96d15c7876..8e5f8bca57 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -2,5 +2,13 @@ "packages/docker-reverse-proxy": "0.0.1", "packages/client-proxy": "0.0.1", "packages/clickhouse": "0.0.1", +<<<<<<< Updated upstream "packages/envd": "0.0.1" +======= + "packages/envd": "0.6.13", + "packages/orchestrator": "0.0.0", + "packages/api": "0.0.0", + "packages/dashboard-api": "0.0.0", + "packages/nomad-nodepool-apm": "0.0.0" +>>>>>>> Stashed changes } diff --git a/packages/envd/pkg/version.go b/packages/envd/pkg/version.go index ff4ce11c61..5e5d110c55 100644 --- a/packages/envd/pkg/version.go +++ b/packages/envd/pkg/version.go @@ -1,3 +1,3 @@ package pkg -const Version = "0.6.13" +const Version = "0.6.13" // x-release-please-version diff --git a/release-please-config.json b/release-please-config.json index 3f67e903a8..72c5ddb8c6 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -28,6 +28,34 @@ "release-type": "go", "component": "envd", "include-v-in-tag": true, +<<<<<<< Updated upstream +======= + "changelog-path": "CHANGELOG.md", + "extra-files": ["pkg/version.go"] + }, + "packages/orchestrator": { + "release-type": "go", + "component": "orchestrator", + "include-v-in-tag": true, + "changelog-path": "CHANGELOG.md" + }, + "packages/api": { + "release-type": "go", + "component": "api", + "include-v-in-tag": true, + "changelog-path": "CHANGELOG.md" + }, + "packages/dashboard-api": { + "release-type": "go", + "component": "dashboard-api", + "include-v-in-tag": true, + "changelog-path": "CHANGELOG.md" + }, + "packages/nomad-nodepool-apm": { + "release-type": "go", + "component": "nomad-nodepool-apm", + "include-v-in-tag": true, +>>>>>>> Stashed changes "changelog-path": "CHANGELOG.md" } } From f9fc2767ab3bc1f0fe85112b9062ab2fbc1725e2 Mon Sep 17 00:00:00 2001 From: Charlie Wyse Date: Thu, 30 Jul 2026 10:38:54 -0700 Subject: [PATCH 2/2] removed merge conflicts --- .release-please-manifest.json | 4 ---- release-please-config.json | 3 --- 2 files changed, 7 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8e5f8bca57..4c2fe9d648 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -2,13 +2,9 @@ "packages/docker-reverse-proxy": "0.0.1", "packages/client-proxy": "0.0.1", "packages/clickhouse": "0.0.1", -<<<<<<< Updated upstream - "packages/envd": "0.0.1" -======= "packages/envd": "0.6.13", "packages/orchestrator": "0.0.0", "packages/api": "0.0.0", "packages/dashboard-api": "0.0.0", "packages/nomad-nodepool-apm": "0.0.0" ->>>>>>> Stashed changes } diff --git a/release-please-config.json b/release-please-config.json index 72c5ddb8c6..a9d1beac6c 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -28,8 +28,6 @@ "release-type": "go", "component": "envd", "include-v-in-tag": true, -<<<<<<< Updated upstream -======= "changelog-path": "CHANGELOG.md", "extra-files": ["pkg/version.go"] }, @@ -55,7 +53,6 @@ "release-type": "go", "component": "nomad-nodepool-apm", "include-v-in-tag": true, ->>>>>>> Stashed changes "changelog-path": "CHANGELOG.md" } }