From d61cb6dee4a35c36a1a6ce28bbe74f25899fba46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Berg=C3=A9?= <berge.greg@gmail.com>
Date: Sun, 7 Jun 2026 21:48:47 +0200
Subject: [PATCH] fix(circleci): fix nonce on retry

---
 packages/core/src/ci-environment/services/circleci.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/ci-environment/services/circleci.ts b/packages/core/src/ci-environment/services/circleci.ts
index 5687f471..2cd93f89 100644
--- a/packages/core/src/ci-environment/services/circleci.ts
+++ b/packages/core/src/ci-environment/services/circleci.ts
@@ -44,7 +44,9 @@ const service: Service = {
       prNumber: getPrNumber({ env }),
       prHeadCommit: null,
       prBaseBranch: null,
-      nonce: env.CIRCLE_WORKFLOW_ID || env.CIRCLE_BUILD_NUM || null,
+      nonce: env.CIRCLE_WORKFLOW_ID
+        ? `${env.CIRCLE_WORKFLOW_ID}-${env.CIRCLE_BUILD_NUM}`
+        : env.CIRCLE_BUILD_NUM || null,
     };
   },
   getMergeBaseCommitSha,