From afa1e69bc1cb74949ebed7e7517f428ae0f93c27 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sat, 30 Jan 2021 17:56:54 -0800
Subject: [PATCH] faster webcam CI (#19975)

* don't copy in openpilot

* need that

* try this

* reenable the condition
---
 .github/workflows/test.yaml |  4 ++--
 tools/webcam/Dockerfile     | 24 +-----------------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3cba82024..43d58673d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -109,9 +109,9 @@ jobs:
         docker pull $DOCKER_REGISTRY/$IMAGE_NAME:latest || true
         docker build --cache-from $DOCKER_REGISTRY/$IMAGE_NAME:latest -t $DOCKER_REGISTRY/$IMAGE_NAME:latest -f tools/webcam/Dockerfile .
     - name: Build openpilot
-      run: docker run --shm-size 1G --rm $DOCKER_REGISTRY/$IMAGE_NAME /bin/sh -c "cd /tmp/openpilot && USE_WEBCAM=1 scons -j$(nproc)"
+      run: docker run --shm-size 1G --rm -v $PWD:/tmp/openpilot -e PYTHONPATH=/tmp/openpilot $DOCKER_REGISTRY/$IMAGE_NAME /bin/sh -c "cd /tmp/openpilot && USE_WEBCAM=1 scons -j$(nproc)"
     - name: Push to container registry
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
+      if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
       run: |
         $DOCKER_LOGIN
         docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest
diff --git a/tools/webcam/Dockerfile b/tools/webcam/Dockerfile
index 55cfc1da7..3babeaec3 100644
--- a/tools/webcam/Dockerfile
+++ b/tools/webcam/Dockerfile
@@ -3,7 +3,7 @@ FROM commaai/openpilot-base:latest
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /tmp/openpilot:${PYTHONPATH}
 
-# install opencv
+# Install opencv
 ENV OPENCV_VERSION '4.2.0'
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -38,25 +38,3 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ldconfig && \
 
     cd /tmp && rm -rf /tmp/opencv_build
-
-
-RUN mkdir -p /tmp/openpilot
-
-COPY SConstruct \
-     .pylintrc \
-     .pre-commit-config.yaml \
-     /tmp/openpilot/
-
-COPY ./pyextra /tmp/openpilot/pyextra
-COPY ./phonelibs /tmp/openpilot/phonelibs
-COPY ./site_scons /tmp/openpilot/site_scons
-COPY ./laika /tmp/openpilot/laika
-COPY ./laika_repo /tmp/openpilot/laika_repo
-COPY ./rednose /tmp/openpilot/rednose
-COPY ./tools /tmp/openpilot/tools
-COPY ./release /tmp/openpilot/release
-COPY ./common /tmp/openpilot/common
-COPY ./opendbc /tmp/openpilot/opendbc
-COPY ./cereal /tmp/openpilot/cereal
-COPY ./panda /tmp/openpilot/panda
-COPY ./selfdrive /tmp/openpilot/selfdrive