Merge branch 'edge' into fix_edit-protocol-modal-input-fields

Opentrons · Dec 4, 2024 · 58489a8 · 58489a8
2 parents 09d4cd4 + 4db216c
commit 58489a8
Show file tree

Hide file tree

Showing 605 changed files with 5,329 additions and 37,378 deletions.
diff --git a/.github/actions/.gitattributes b/.github/actions/.gitattributes
@@ -1 +1 @@
-.github/actions/odd-resource-analysis/dist/* binary
+odd-resource-analysis/dist/* binary
diff --git a/.github/actions/odd-resource-analysis/action/lib/helpers/mixpanel.js b/.github/actions/odd-resource-analysis/action/lib/helpers/mixpanel.js
@@ -33,7 +33,7 @@ async function getMixpanelResourceMonitorDataFor({
   where,
 }) {
   const params = new URLSearchParams({
-    project_id: projectId,
+    project_id: parseInt(projectId),
     from_date: fromDate,
     to_date: toDate,
     event: '["resourceMonitorReport"]',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.github/actions/odd-resource-analysis/dist/* binary
		odd-resource-analysis/dist/* binary