Merge pull request #1278 from cloud-carbon-footprint/changeset-releas…

…e/trunk Version Packages
cloud-carbon-footprint · Jan 2, 2024 · c12d1c7 · c12d1c7
2 parents 88cf1a9 + 8f7684d
commit c12d1c7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/.changeset/four-pots-taste.md b/.changeset/four-pots-taste.md
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @cloud-carbon-footprint/app
 
+## 1.7.0
+
+### Minor Changes
+
+- 608bdcb2: Improves merging for setting estimates to the JSON cache, fixes recurring file parsing issue
+
 ## 1.6.0
 
 ### Minor Changes

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloud-carbon-footprint/app",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "license": "Apache-2.0",
   "description": "The logic to bootstrap the cloud-carbon-footprint server-side application",
   "main": "src/index.ts",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @cloud-carbon-footprint/cli
 
+## 1.12.4
+
+### Patch Changes
+
+- Updated dependencies [608bdcb2]
+  - @cloud-carbon-footprint/app@1.7.0
+
 ## 1.12.3
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloud-carbon-footprint/cli",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "license": "Apache-2.0",
   "description": "Command Line Interface as an entrypoint to get cloud energy and carbon emissions.",
   "main": "src/index.ts",
@@ -70,7 +70,7 @@
   "dependencies": {
     "@azure/arm-consumption": "^9.2.0",
     "@azure/arm-resources-subscriptions": "^2.0.2",
-    "@cloud-carbon-footprint/app": "1.6.0",
+    "@cloud-carbon-footprint/app": "1.7.0",
     "@cloud-carbon-footprint/common": "^1.13.2",
     "@types/cli-table": "^0.3.0",
     "@types/prompts": "^2.0.12",

diff --git a/yarn.lock b/yarn.lock
@@ -2432,7 +2432,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@cloud-carbon-footprint/app@1.6.0, @cloud-carbon-footprint/app@^1.4.0, @cloud-carbon-footprint/app@workspace:packages/app":
+"@cloud-carbon-footprint/app@1.7.0, @cloud-carbon-footprint/app@^1.4.0, @cloud-carbon-footprint/app@workspace:packages/app":
   version: 0.0.0-use.local
   resolution: "@cloud-carbon-footprint/app@workspace:packages/app"
   dependencies:
@@ -2546,7 +2546,7 @@ __metadata:
   dependencies:
     "@azure/arm-consumption": ^9.2.0
     "@azure/arm-resources-subscriptions": ^2.0.2
-    "@cloud-carbon-footprint/app": 1.6.0
+    "@cloud-carbon-footprint/app": 1.7.0
     "@cloud-carbon-footprint/common": ^1.13.2
     "@types/cli-table": ^0.3.0
     "@types/jest": ^27.4.0