From 55dedc0476ceb01483caf3a96f48f228981ef69c Mon Sep 17 00:00:00 2001
From: Adeeb <8762862+adeebshihadeh@users.noreply.github.com>
Date: Sat, 30 May 2020 10:04:56 -0700
Subject: [PATCH] pyextra isn't a submodule anymore (#1601)

old-commit-hash: cc2137bdedb8c65d6d9d32a1234250225dc2d3dc
---
 .github/workflows/test.yaml | 2 +-
 release/build_devel.sh      | 3 +--
 release/files_common        | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 57821c9c6f..eb0499c32d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
         cp Pipfile Pipfile.lock flake8_openpilot.sh pylint_openpilot.sh .pylintrc \
            cppcheck_openpilot.sh .coveragerc-app .pre-commit-config.yaml $TEST_DIR
         cd $TEST_DIR
-        mkdir pyextra laika laika_repo tools release
+        mkdir laika laika_repo tools release
     - name: Build Docker image
       run: cd $TEST_DIR && eval "$BUILD"
     - name: Build openpilot
diff --git a/release/build_devel.sh b/release/build_devel.sh
index 26f92445a3..c3028d5520 100755
--- a/release/build_devel.sh
+++ b/release/build_devel.sh
@@ -65,7 +65,6 @@ git clean -xdf
 add_subtree "cereal" "cereal" master
 add_subtree "panda" "panda" master
 add_subtree "opendbc" "opendbc" master
-add_subtree "openpilot-pyextra" "pyextra" master
 
 # leave .git alone
 echo "[-] erasing old openpilot T=$SECONDS"
@@ -75,7 +74,7 @@ rm -rf $TARGET_DIR/* $TARGET_DIR/.gitmodules
 find . -maxdepth 1 -type f -delete
 
 # dont delete our subtrees
-git checkout -- cereal panda opendbc pyextra
+git checkout -- cereal panda opendbc
 
 # reset tree and get version
 cd $SOURCE_DIR
diff --git a/release/files_common b/release/files_common
index 03509a3023..cb760dcc8f 100644
--- a/release/files_common
+++ b/release/files_common
@@ -442,4 +442,6 @@ installer/updater/Makefile
 scripts/update_now.sh
 scripts/stop_updater.sh
 
+pyextra/**
+
 rednose/**