move ci_build and ci_cache out of workdir

DangerKlippers · Sep 5, 2023 · 42168e2 · 42168e2
1 parent f9ff481
commit 42168e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci-build_test.yaml b/.github/workflows/ci-build_test.yaml
@@ -16,6 +16,7 @@ jobs:
             klippy:
               - 'klippy/**'
               - 'test/**'
+              - 'scripts/**'
             klipper:
               - 'src/**'
               - 'lib/**'

diff --git a/scripts/Dockerfile-build b/scripts/Dockerfile-build
@@ -11,5 +11,5 @@ WORKDIR /klipper
 
 RUN ./scripts/ci-install.sh
 RUN ./scripts/ci-build.sh
-ENV PATH="/klipper/ci_build/python-env/bin:$PATH"
+ENV PATH="/ci_build/python-env/bin:$PATH"
 RUN pip install -r ./scripts/requirements_dev.txt
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
@@ -6,7 +6,7 @@ set -eu
 
 # Paths to tools installed by ci-install.sh
 MAIN_DIR=${PWD}
-BUILD_DIR=${PWD}/ci_build
+BUILD_DIR=/ci_build
 export PATH=${BUILD_DIR}/pru-gcc/bin:${PATH}
 export PATH=${BUILD_DIR}/or1k-linux-musl-cross/bin:${PATH}
 PYTHON=${BUILD_DIR}/python-env/bin/python

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
@@ -6,8 +6,8 @@
 set -eux
 
 MAIN_DIR=${PWD}
-BUILD_DIR=${PWD}/ci_build
-CACHE_DIR=${PWD}/ci_cache
+BUILD_DIR=/ci_build
+CACHE_DIR=/ci_cache
 mkdir -p ${BUILD_DIR} ${CACHE_DIR}