public/getpkg
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

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

Browse Source
This commit is contained in:
Your Name
2025-06-29 21:40:27 +12:00
parent de200a5bb6
commit e5f3569b2a
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dehydrate/build.sh
View File

@ -16,10 +16,6 @@ echo "Build script running from: ${SCRIPT_DIR}"
echo "Current directory: $(pwd)" echo "Current directory: $(pwd)"
echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "yes" || echo "no")" echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "yes" || echo "no")"
# Create persistent build directory
mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "${SCRIPT_DIR}/output"
# Run build in container with mounted directories # Run build in container with mounted directories
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
@ -29,8 +25,7 @@ docker run --rm \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \ gitea.jde.nz/public/dropshell-build-base:latest \
bash -c " bash -c "
echo 'Contents of /src:' && ls -la /src && \ mkdir -p /build /output && \
echo 'Looking for CMakeLists.txt:' && find /src -name 'CMakeLists.txt' && \
cd /build && \ cd /build && \
cmake -G Ninja -S /src -B . \ cmake -G Ninja -S /src -B . \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \

11
getpkg/build.sh
View File

@ -18,24 +18,17 @@ echo "CMakeLists.txt exists: $([ -f "${SCRIPT_DIR}/CMakeLists.txt" ] && echo "ye
echo "Contents of script directory:" echo "Contents of script directory:"
ls -la "${SCRIPT_DIR}" ls -la "${SCRIPT_DIR}"
# Create persistent build directory
mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "${SCRIPT_DIR}/output"
# Run build in container with mounted directories # Run build in container with mounted directories
# Note: We mount the directory without :ro first to check if that's the issue
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
-v "${SCRIPT_DIR}:/src" \ -v "${SCRIPT_DIR}:/src:ro" \
-v "${SCRIPT_DIR}/build:/build" \ -v "${SCRIPT_DIR}/build:/build" \
-v "${SCRIPT_DIR}/output:/output" \ -v "${SCRIPT_DIR}/output:/output" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \ gitea.jde.nz/public/dropshell-build-base:latest \
bash -c " bash -c "
echo 'Host script dir contains:' && \
echo 'Contents of /src:' && ls -la /src && \ echo 'Contents of /src:' && ls -la /src && \
echo 'Looking for CMakeLists.txt:' && find /src -name 'CMakeLists.txt' && \ mkdir -p /build /output && \
echo 'Source files in /src:' && ls -la /src/src 2>/dev/null || echo 'No src directory found' && \
cd /build && \ cd /build && \
cmake -G Ninja -S /src -B . \ cmake -G Ninja -S /src -B . \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \