From 33a85302e0196c9c6d41438f3acac5140fe58b58 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 8 Jul 2022 13:00:43 -0700
Subject: [PATCH] Fix master-ci dirty working tree + CI test (#25087)

* check

* test for dirty working tree

* swap order

* fix diff
old-commit-hash: df251ef50ebfe5c997e14a03fca4ec932bc4c5cf
---
 .github/workflows/selfdrive_tests.yaml |  7 +++++--
 .gitignore                             |  2 --
 Jenkinsfile                            |  1 +
 rednose_repo                           |  2 +-
 release/check-dirty.sh                 | 11 +++++++++++
 release/files_common                   |  3 +++
 selfdrive/loggerd/.gitignore           |  1 +
 7 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100755 release/check-dirty.sh

diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index 35a08d4fe9..99a21b58f3 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -59,11 +59,14 @@ jobs:
         TARGET_DIR=$STRIPPED_DIR release/build_devel.sh
         cp Dockerfile.openpilot_base $STRIPPED_DIR
     - name: Build Docker image
-      run: eval "$BUILD"
+      run: |
+          eval "$BUILD"
+          rm $STRIPPED_DIR/Dockerfile.openpilot_base
     - name: Build openpilot and run checks
       run: |
           cd $STRIPPED_DIR
           ${{ env.RUN }} "CI=1 python selfdrive/manager/build.py && \
+                          release/check-dirty.sh && \
                           python -m unittest discover selfdrive/car"
 
   build_all:
@@ -89,7 +92,7 @@ jobs:
     - name: Build Docker image
       run: eval "$BUILD"
     - name: Build openpilot with all flags
-      run: ${{ env.RUN }} "scons -j$(nproc) --extras --test"
+      run: ${{ env.RUN }} "scons -j$(nproc) --extras --test && release/check-dirty.sh"
     - name: Cleanup scons cache
       run: |
           ${{ env.RUN }} "scons -j$(nproc) --extras --test && \
diff --git a/.gitignore b/.gitignore
index 0092c4dc94..e1ff5d5008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,6 @@ system/proclogd/proclogd
 selfdrive/ui/_ui
 selfdrive/test/longitudinal_maneuvers/out
 selfdrive/visiond/visiond
-selfdrive/loggerd/loggerd
-selfdrive/loggerd/bootlog
 selfdrive/sensord/_gpsd
 selfdrive/sensord/_sensord
 system/camerad/camerad
diff --git a/Jenkinsfile b/Jenkinsfile
index 0fa623fbcd..4e13717851 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -115,6 +115,7 @@ pipeline {
             phone_steps("tici", [
               ["build master-ci", "cd $SOURCE_DIR/release && TARGET_DIR=$TEST_DIR EXTRA_FILES='tools/' ./build_devel.sh"],
               ["build openpilot", "cd selfdrive/manager && ./build.py"],
+              ["check dirty", "release/check-dirty.sh"],
               ["test manager", "python selfdrive/manager/test/test_manager.py"],
               ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"],
               ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
diff --git a/rednose_repo b/rednose_repo
index 225dbacbaa..3b6bd703b7 160000
--- a/rednose_repo
+++ b/rednose_repo
@@ -1 +1 @@
-Subproject commit 225dbacbaac312f85eaaee0b97a3acc31f9c6b47
+Subproject commit 3b6bd703b7a7667e4f82d0b81ef9a454819b94bd
diff --git a/release/check-dirty.sh b/release/check-dirty.sh
new file mode 100755
index 0000000000..9c6389f380
--- /dev/null
+++ b/release/check-dirty.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+set -e
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+cd $DIR
+
+if [ ! -z "$(git status --porcelain)" ]; then
+  echo "Dirty working tree after build:"
+  git status --porcelain
+  exit 1
+fi
diff --git a/release/files_common b/release/files_common
index 260e37e29a..fb91170561 100644
--- a/release/files_common
+++ b/release/files_common
@@ -231,6 +231,7 @@ selfdrive/locationd/models/gnss_helpers.py
 
 selfdrive/locationd/calibrationd.py
 
+system/logcatd/.gitignore
 system/logcatd/SConscript
 system/logcatd/logcatd_systemd.cc
 
@@ -239,6 +240,7 @@ system/proclogd/main.cc
 system/proclogd/proclog.cc
 system/proclogd/proclog.h
 
+selfdrive/loggerd/.gitignore
 selfdrive/loggerd/SConscript
 selfdrive/loggerd/encoder/encoder.cc
 selfdrive/loggerd/encoder/encoder.h
@@ -414,6 +416,7 @@ scripts/stop_updater.sh
 pyextra/.gitignore
 pyextra/acados_template/**
 
+rednose/.gitignore
 rednose/**
 laika/**
 
diff --git a/selfdrive/loggerd/.gitignore b/selfdrive/loggerd/.gitignore
index 6437be5e38..53dc24e6f2 100644
--- a/selfdrive/loggerd/.gitignore
+++ b/selfdrive/loggerd/.gitignore
@@ -1,3 +1,4 @@
 loggerd
 encoderd
+bootlog
 tests/test_logger