diff --git a/.github/workflows/ci-build_test.yaml b/.github/workflows/ci-build_test.yaml index 9fa61452c..2d9dfba2b 100644 --- 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 index 3df909dd2..e17c86aea 100644 --- 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 index b10a98de1..555786814 100755 --- 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 index 39ec2796d..0195860cc 100755 --- 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}