From ef2bb7f2fc07f4b94709cee752386be815eea8aa Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 22 Aug 2025 20:06:12 -0700
Subject: [PATCH] release: build orphaned branch (#36047)

---
 .github/workflows/release.yaml                |  2 +-
 .github/workflows/selfdrive_tests.yaml        |  2 +-
 release/{build_devel.sh => build_stripped.sh} | 23 ++++++++-----------
 3 files changed, 11 insertions(+), 16 deletions(-)
 rename release/{build_devel.sh => build_stripped.sh} (83%)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4065b0ef3e..0f4ce6cb3a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -39,4 +39,4 @@ jobs:
         git config --global --add safe.directory '*'
         git lfs pull
     - name: Push master-ci
-      run: BRANCH=__nightly release/build_devel.sh
+      run: BRANCH=__nightly release/build_stripped.sh
diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index aad772757d..cdafbbfede 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -52,7 +52,7 @@ jobs:
         command: git lfs pull
     - name: Build devel
       timeout-minutes: 1
-      run: TARGET_DIR=$STRIPPED_DIR release/build_devel.sh
+      run: TARGET_DIR=$STRIPPED_DIR release/build_stripped.sh
     - uses: ./.github/workflows/setup-with-retry
     - name: Build openpilot and run checks
       timeout-minutes: ${{ ((steps.restore-scons-cache.outputs.cache-hit == 'true') && 10 || 30) }} # allow more time when we missed the scons cache
diff --git a/release/build_devel.sh b/release/build_stripped.sh
similarity index 83%
rename from release/build_devel.sh
rename to release/build_stripped.sh
index c4ef280258..6f1a568c25 100755
--- a/release/build_devel.sh
+++ b/release/build_stripped.sh
@@ -17,29 +17,23 @@ rm -rf $TARGET_DIR
 mkdir -p $TARGET_DIR
 cd $TARGET_DIR
 cp -r $SOURCE_DIR/.git $TARGET_DIR
-pre-commit uninstall || true
 
-echo "[-] bringing __nightly and devel in sync T=$SECONDS"
+echo "[-] setting up stripped branch sync T=$SECONDS"
 cd $TARGET_DIR
 
-git fetch --depth 1 origin __nightly
-git fetch --depth 1 origin devel
-
-git checkout -f --track origin/__nightly
-git reset --hard __nightly
-git checkout __nightly
-git reset --hard origin/devel
-git clean -xdff
-git submodule foreach --recursive git clean -xdff
-git lfs uninstall
+# tmp branch
+git checkout --orphan tmp
 
 # remove everything except .git
 echo "[-] erasing old openpilot T=$SECONDS"
+git submodule deinit -f --all
+git rm -rf --cached .
 find . -maxdepth 1 -not -path './.git' -not -name '.' -not -name '..' -exec rm -rf '{}' \;
 
-# reset source tree
+# cleanup before the copy
 cd $SOURCE_DIR
 git clean -xdff
+git submodule foreach --recursive git clean -xdff
 
 # do the files copy
 echo "[-] copying files T=$SECONDS"
@@ -48,6 +42,7 @@ cp -pR --parents $(./release/release_files.py) $TARGET_DIR/
 
 # in the directory
 cd $TARGET_DIR
+rm -rf .git/modules/
 rm -f panda/board/obj/panda.bin.signed
 
 # include source commit hash and build date in commit
@@ -86,7 +81,7 @@ fi
 
 if [ ! -z "$BRANCH" ]; then
   echo "[-] Pushing to $BRANCH T=$SECONDS"
-  git push -f origin __nightly:$BRANCH
+  git push -f origin tmp:$BRANCH
 fi
 
 echo "[-] done T=$SECONDS, ready at $TARGET_DIR"