Update 2 files
Some checks failed
Build-Test-Publish / build (linux/amd64) (push) Failing after 7s
Build-Test-Publish / build (linux/arm64) (push) Failing after 7s
Build-Test-Publish / test-install-from-scratch (linux/amd64) (push) Has been skipped
Build-Test-Publish / test-install-from-scratch (linux/arm64) (push) Has been skipped

This commit is contained in:
Your Name
2025-06-29 21:59:50 +12:00
parent 9dda4e1649
commit 2ab38fd053
2 changed files with 8 additions and 5 deletions

View File

@ -16,18 +16,19 @@ echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "${SCRIPT_DIR}/output"
cd "${SCRIPT_DIR}" || exit 1
# Run build in container with mounted directories
docker run --rm \
--user "$(id -u):$(id -g)" \
-v "${SCRIPT_DIR}:/app" \
-w /app \
-v ".:/app" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \
bash -c "
cd /app/build && \
cd /app && ls -la && \
cmake -G Ninja -S /app -B /app/build \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-DPROJECT_NAME=${PROJECT} && \
cmake --build /app/build && \
cp ${PROJECT} /app/output/
cp /app/build/${PROJECT} /app/output/
"

View File

@ -16,10 +16,12 @@ echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "${SCRIPT_DIR}/output"
cd "${SCRIPT_DIR}" || exit 1
# Run build in container with mounted directories
docker run --rm \
--user "$(id -u):$(id -g)" \
-v "${SCRIPT_DIR}:/app" \
-v ".:/app" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \
bash -c "