From 3dff89fa3b234518d900b01ccb1f90895f1c2d75 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Sat, 10 Aug 2024 23:13:16 -0400
Subject: [PATCH] Revert "try this out"

This reverts commit dd939da69b8cc8144f47dd14b6d7bc4537403276.
---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a31e9ba50b..23881001fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,12 +82,10 @@ build:
     - "echo VERSION: ${VERSION}"
     - "echo CI_COMMIT_REF_NAME: ${CI_COMMIT_REF_NAME}"
     - git config --global --add safe.directory ${CI_PROJECT_DIR}
-    - '[ -d /dev/shm/scons_cache ] || sudo mkdir -p /dev/shm/scons_cache'
-    - rsync -a "${CI_DIR}/scons_cache/" /dev/shm/scons_cache/
   script:
     - export PYTHONPATH="$BUILD_DIR"
     - "echo Building Panda..."
-    - scons -j$(nproc) cache_dir=/dev/shm/scons_cache ${CI_PROJECT_DIR}/panda
+    - scons -j$(nproc) cache_dir=${CI_DIR}/scons_cache ${CI_PROJECT_DIR}/panda
     - mkdir -p ${BUILD_DIR}
     - ls -la ${BUILD_DIR}
     - "echo Building Rest..."
@@ -95,7 +93,7 @@ build:
     # - cp -pR --parents $(cat release/files_common release/files_tici | sort | uniq) $BUILD_DIR/ 2> >(grep -v 'warning:' >&2)
     - cd $BUILD_DIR
     - sed -i '/from .board.jungle import PandaJungle, PandaJungleDFU/s/^/#/' panda/__init__.py # comment panda jungle when prebuilt
-    - scons -j$(nproc) cache_dir=/dev/shm/scons_cache --minimal
+    - scons -j$(nproc) cache_dir=${CI_DIR}/scons_cache --minimal
     - touch ${BUILD_DIR}/prebuilt
     - sudo rm -rf ${OUTPUT_DIR}
     - mkdir -p ${OUTPUT_DIR}
@@ -140,7 +138,7 @@ build:
       --chown=comma:comma
       ${BUILD_DIR}/ ${OUTPUT_DIR}/
   after_script:
-    - rsync -a /dev/shm/scons_cache/ "${CI_DIR}/scons_cache/"
+    # cleanup build dir after doing work
     - find $BUILD_DIR/ -mindepth 1 -delete
   artifacts:
     paths: