From 926e0dfca63dc73afab9c0307c473825cf07502e Mon Sep 17 00:00:00 2001
From: iejMac <61431446+iejMac@users.noreply.github.com>
Date: Mon, 8 Mar 2021 21:33:15 -0800
Subject: [PATCH] Move simulator CI to tools workflow (#20285)

* sim CI

* simulator CI

* scons already in Dockerfile.sim

* faster

* fast

* testing
old-commit-hash: 539426033b87e175d874973b6cdf633e8a70d0be
---
 .github/workflows/sim_tests.yaml   | 26 --------------------------
 .github/workflows/tools_tests.yaml | 26 +++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/sim_tests.yaml

diff --git a/.github/workflows/sim_tests.yaml b/.github/workflows/sim_tests.yaml
deleted file mode 100644
index 3d703e506b..0000000000
--- a/.github/workflows/sim_tests.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: simulator
-on:
-  schedule:
-  - cron: '0 * * * *'
-
-jobs:
-  docker_build:
-    name: build container
-    runs-on: ubuntu-20.04
-    timeout-minutes: 50
-    if: github.repository == 'commaai/openpilot'
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-        lfs: true
-    - name: Docker build
-      run: |
-        docker pull commaai/openpilot-sim:latest || true
-        tools/sim/build_container.sh
-    - name: Push to dockerhub
-      if: github.ref == 'refs/heads/master'
-      run: |
-        docker login -u wmelching -p ${{ secrets.COMMA_DOCKERHUB_TOKEN }}
-        docker tag commaai/openpilot-sim docker.io/commaai/openpilot-sim:latest
-        docker push docker.io/commaai/openpilot-sim:latest
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index ed61168016..b6b45bb24e 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -6,6 +6,7 @@ on:
 env:
   BASE_IMAGE: openpilot-base
   DOCKER_REGISTRY: ghcr.io/commaai
+  DOCKER_LOGIN: docker login ghcr.io -u adeebshihadeh -p ${{ secrets.CONTAINER_TOKEN }}
 
   BUILD: |
       docker pull $(grep -iohP '(?<=^from)\s+\S+' Dockerfile.openpilot_base) || true
@@ -23,7 +24,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - name: Build docker image
+    - name: Build Docker image
       run: eval "$BUILD"
     - name: Unit test
       run: |
@@ -32,3 +33,26 @@ jobs:
                         apt-get install -y libdw-dev libqt5svg5-dev libqt5x11extras5-dev && \
                         cd /tmp/openpilot/tools/plotjuggler && \
                         ./test_plotjuggler.py"
+
+  simulator:
+    name: simulator
+    runs-on: ubuntu-20.04
+    timeout-minutes: 50
+    env:
+      IMAGE_NAME: openpilot-sim
+    if: github.repository == 'commaai/openpilot'
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        lfs: true
+    - name: Build Docker image
+      run: |
+        eval "$BUILD"
+        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/sim/Dockerfile.sim .
+    - name: Push to container registry
+      if: github.ref == 'refs/heads/master' && github.repository == 'commaai/openpilot'
+      run: |
+        $DOCKER_LOGIN
+        docker push $DOCKER_REGISTRY/$IMAGE_NAME:latest