From 7290627131f653968d20fdc67aa98611109918ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Jun 2026 14:28:14 -0400 Subject: [PATCH 1/2] hotfix(test): cherry-pick 6a539147 (#304) * fix: multi-env hotfix patch 1 (#302) Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] (cherry picked from commit 6a5391478334207598d1850eb5d6567fd1232667) * fix: multi-env hotfix patch 2 (#303) Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] (cherry picked from commit e32cf605c3f71f014dc5da7c939498a16bc39dd8) --------- Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- src/hotfix-28191413994-1-1.txt | 1 + src/hotfix-28191413994-1-2.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/hotfix-28191413994-1-1.txt create mode 100644 src/hotfix-28191413994-1-2.txt diff --git a/src/hotfix-28191413994-1-1.txt b/src/hotfix-28191413994-1-1.txt new file mode 100644 index 00000000..3d428675 --- /dev/null +++ b/src/hotfix-28191413994-1-1.txt @@ -0,0 +1 @@ +// multi-env hotfix change 1 2026-06-25T18:26:21WZ diff --git a/src/hotfix-28191413994-1-2.txt b/src/hotfix-28191413994-1-2.txt new file mode 100644 index 00000000..efcbac98 --- /dev/null +++ b/src/hotfix-28191413994-1-2.txt @@ -0,0 +1 @@ +// multi-env hotfix change 2 2026-06-25T18:26:29WZ From 2d63084a676bb0e751f5a5a7aca21e85f699751b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Jun 2026 14:53:06 -0400 Subject: [PATCH 2/2] fix: trunk patch that conflicts on env/test (#312) Signed-off-by: cascade-validation Co-authored-by: cascade-validation (cherry picked from commit 3a74ae9914617d1abe47a903befb2374129308a0) --- src/hotfix-conflict-28191930773-1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/hotfix-conflict-28191930773-1.txt diff --git a/src/hotfix-conflict-28191930773-1.txt b/src/hotfix-conflict-28191930773-1.txt new file mode 100644 index 00000000..1ce13764 --- /dev/null +++ b/src/hotfix-conflict-28191930773-1.txt @@ -0,0 +1 @@ +trunk side of the conflict