From ecc880ef6fce107e25366950dc24f693c40540db Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jsmith@influxdata.com>
Date: Thu, 20 Nov 2025 10:40:56 -0500
Subject: [PATCH 1/4] chore: use https checkout

---
 .circleci/config.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6fd133..ab218dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,15 @@
 version: 2.1
 
 commands:
+  checkout_https:
+    description: Checkout code via HTTPS
+    steps:
+      - run:
+          name: Checkout code via HTTPS
+          command: |
+            git clone https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git .
+            git checkout ${CIRCLE_SHA1}
+
   rust_components:
     description: Verify installed components
     steps:
@@ -41,7 +50,7 @@ jobs:
       # "1" means line tables only, which is useful for panic tracebacks.
       RUSTFLAGS: "-C debuginfo=1"
     steps:
-      - checkout
+      - checkout_https
       - rust_components
       - cache_restore
       - run:
@@ -59,7 +68,7 @@ jobs:
       # "1" means line tables only, which is useful for panic tracebacks.
       RUSTFLAGS: "-C debuginfo=1"
     steps:
-      - checkout
+      - checkout_https
       - rust_components
       - cache_restore
       - run:
@@ -77,7 +86,7 @@ jobs:
       # "1" means line tables only, which is useful for panic tracebacks.
       RUSTFLAGS: "-C debuginfo=1"
     steps:
-      - checkout
+      - checkout_https
       - rust_components
       - cache_restore
       - run:
@@ -97,7 +106,7 @@ jobs:
       # "1" means line tables only, which is useful for panic tracebacks.
       RUSTFLAGS: "-C debuginfo=1"
     steps:
-      - checkout
+      - checkout_https
       - rust_components
       - cache_restore
       - run:
@@ -121,7 +130,7 @@ jobs:
       RUSTFLAGS: "-C debuginfo=1"
       RUST_BACKTRACE: "1"
     steps:
-      - checkout
+      - checkout_https
       - rust_components
       - cache_restore
       - run:
@@ -148,7 +157,7 @@ jobs:
     docker:
       - image: archlinux
     steps:
-      - checkout
+      - checkout_https
       - run:
           name: Install protobuf and git and dependencies
           command: pacman -Sy --noconfirm protobuf git gcc-libs && protoc --version

From 0a390eb6317b4eab0f74651ba1a176206d5a26a7 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jsmith@influxdata.com>
Date: Thu, 20 Nov 2025 10:43:31 -0500
Subject: [PATCH 2/4] chore: fix checkout

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ab218dc..e9d3556 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,8 @@ commands:
       - run:
           name: Checkout code via HTTPS
           command: |
-            git clone https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git .
+            git clone --no-checkout https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git .
+            git fetch origin ${CIRCLE_BRANCH}
             git checkout ${CIRCLE_SHA1}
 
   rust_components:

From 91f880286b9f69136fb3dc9f0f31eb261465f5ba Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jsmith@influxdata.com>
Date: Thu, 20 Nov 2025 10:52:41 -0500
Subject: [PATCH 3/4] chore: try something else

---
 .circleci/config.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9d3556..260022e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,8 +7,14 @@ commands:
       - run:
           name: Checkout code via HTTPS
           command: |
-            git clone --no-checkout https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git .
-            git fetch origin ${CIRCLE_BRANCH}
+            git clone https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}.git .
+            if [ -n "${CIRCLE_PR_USERNAME}" ] && [ -n "${CIRCLE_PR_REPONAME}" ]; then
+              # Fetch from fork for PR builds
+              git remote add fork https://github.com/${CIRCLE_PR_USERNAME}/${CIRCLE_PR_REPONAME}.git
+              git fetch fork
+            fi
+            # Fetch all branches and PRs from origin
+            git fetch origin +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/* || true
             git checkout ${CIRCLE_SHA1}
 
   rust_components:

From 3cc61452f1b56c75f1c4834d7932082a20ff89f7 Mon Sep 17 00:00:00 2001
From: Jeffrey Smith II <jsmith@influxdata.com>
Date: Thu, 20 Nov 2025 10:54:03 -0500
Subject: [PATCH 4/4] chore: try something else

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 260022e..d02a492 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,10 +164,11 @@ jobs:
     docker:
       - image: archlinux
     steps:
-      - checkout_https
+      # Run first to install git
       - run:
           name: Install protobuf and git and dependencies
           command: pacman -Sy --noconfirm protobuf git gcc-libs && protoc --version
+      - checkout_https
       - run:
           name: Regenerate descriptors
           working_directory: pbjson-types