public/getpkg
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 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-30 20:43:45 +12:00
parent aa04f5e71e
commit decf16da7f
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dehydrate/build.sh
View File

@ -8,9 +8,8 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
# Debug output for CI # Debug output for CI
echo "${PROJECT} build script running from: ${SCRIPT_DIR}" echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
# handle running locally, or docker in docker via gitea runner.
MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app" MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}" echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}" MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
@ -20,16 +19,16 @@ fi
COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-DPROJECT_NAME=${PROJECT} && \ -DPROJECT_NAME=${PROJECT} && \
cmake --build ./build" cmake --build ./build"
echo "Building in new docker container" echo "Building in new docker container"
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
${MOUNT_CMD} \ "${MOUNT_CMD}" \
-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 "cd /app && ${COMMAND_TO_RUN}" bash -c "${COMMAND_TO_RUN}"
[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found" [ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"
echo "Build complete" echo "Build complete"

9
getpkg/build.sh
View File

@ -8,9 +8,8 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
# Debug output for CI # Debug output for CI
echo "${PROJECT} build script running from: ${SCRIPT_DIR}" echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
# handle running locally, or docker in docker via gitea runner.
MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app" MOUNT_CMD="-v ${SCRIPT_DIR}:/app -w /app"
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}" echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}" MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
@ -20,16 +19,16 @@ fi
COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-DPROJECT_NAME=${PROJECT} && \ -DPROJECT_NAME=${PROJECT} && \
cmake --build ./build" cmake --build ./build"
echo "Building in new docker container" echo "Building in new docker container"
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
${MOUNT_CMD} \ "${MOUNT_CMD}" \
-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 "${COMMAND_TO_RUN}" bash -c "${COMMAND_TO_RUN}"
[ -f "./build/${PROJECT}" ] && cp "./build/${PROJECT}" ./output/ || echo "No output file found" [ -f "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found"
echo "Build complete" echo "Build complete"