From edbd5d330e37702b4e85796893c8529e4ada1aa2 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Wed, 16 Aug 2023 17:59:42 -0700
Subject: [PATCH] CI: use setup script for docs and simulator (#29434)

* use setup

* dont pull lfs for docs

* fix inputs

* bool not supported

* bool isnt supported
old-commit-hash: ad00595ba5f7716840afbdf548a9bdf1290dbfeb
---
 .github/workflows/setup/action.yaml |  7 +++++++
 .github/workflows/tools_tests.yaml  | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/setup/action.yaml b/.github/workflows/setup/action.yaml
index 7810730832..a6c58aae08 100644
--- a/.github/workflows/setup/action.yaml
+++ b/.github/workflows/setup/action.yaml
@@ -1,10 +1,17 @@
 name: 'openpilot env setup'
 
+inputs:
+  git_lfs:
+    description: 'Whether or not to pull the git lfs'
+    required: false
+    default: 'true'
+
 runs:
   using: "composite"
   steps:
     # do this after checkout to ensure our custom LFS config is used to pull from GitLab
     - shell: bash
+      if: ${{ inputs.git_lfs == 'true' }}
       run: git lfs pull
 
     # build cache
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 0ee390d5e9..e0d471882f 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -57,10 +57,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Pull LFS
-      run: git lfs pull
-    - name: Build base image
-      run: eval "$BUILD"
+    - uses: ./.github/workflows/setup
     - name: Build base cl image
       run: eval "$BUILD_CL"
     - name: Build simulator image
@@ -75,14 +72,17 @@ jobs:
     name: build docs
     runs-on: ubuntu-20.04
     timeout-minutes: 45
+    env:
+      BUILD: |
+        DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest -t $DOCKER_REGISTRY/openpilot-docs-base:latest -f docs/docker/Dockerfile --target openpilot-docs-base .
+        DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
-    - name: Build docker container
-      run: |
-        DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest -t $DOCKER_REGISTRY/openpilot-docs-base:latest -f docs/docker/Dockerfile --target openpilot-docs-base .
-        DOCKER_BUILDKIT=1 docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $DOCKER_REGISTRY/openpilot-docs-base:latest --cache-from $DOCKER_REGISTRY/openpilot-docs:latest -t $DOCKER_REGISTRY/openpilot-docs:latest -f docs/docker/Dockerfile .
+    - uses: ./.github/workflows/setup
+      with:
+        git_lfs: false
     - name: Push docker container
       if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/openpilot'
       run: |