From 7149b8714ec1b22392aa4c4a79847f154a8d7282 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Jun 2025 23:23:27 +1200 Subject: [PATCH] Modify getpkg/build.sh --- getpkg/build.sh | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/getpkg/build.sh b/getpkg/build.sh index e03aa7b..b41594a 100755 --- a/getpkg/build.sh +++ b/getpkg/build.sh @@ -13,8 +13,15 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")" # Debug output for CI echo "${PROJECT} build script running from: ${SCRIPT_DIR}" -mkdir -p "${SCRIPT_DIR}/build" -mkdir -p "${SCRIPT_DIR}/output" +MAIN_DIR="${SCRIPT_DIR}" +if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then + MAIN_DIR="/runner/${PROJECT}" + + mkdir -p "${MAIN_DIR}" + cp -r "${SCRIPT_DIR}/*" "${MAIN_DIR}/" + mkdir -p "${MAIN_DIR}/build" + mkdir -p "${MAIN_DIR}/output" +fi # Run build in container with mounted directories COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ @@ -26,11 +33,16 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ echo "Building in new docker container" docker run --rm \ --user "$(id -u):$(id -g)" \ - -v "${SCRIPT_DIR}:/app:ro" \ - -v "${SCRIPT_DIR}/build:/app/build" \ - -v "${SCRIPT_DIR}/output:/app/output" \ + -v "${MAIN_DIR}:/app:ro" \ + -v "${MAIN_DIR}/build:/app/build" \ + -v "${MAIN_DIR}/output:/app/output" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ gitea.jde.nz/public/dropshell-build-base:latest \ bash -c "cd /app && ${COMMAND_TO_RUN}" -echo "Build complete" \ No newline at end of file +if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then + cp -r "${MAIN_DIR}/output/*" "${SCRIPT_DIR}/output/" + rm -rf "${MAIN_DIR}" +fi + +echo "Build complete"