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 1m0s
Details
Build-Test-Publish / build (linux/arm64) (push) Failing after 1m18s
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 22:22:06 +12:00
parent d27904ec05
commit d13011a329
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dehydrate/build.sh
View File

@ -11,13 +11,20 @@ echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
# handle running locally, or docker in docker via gitea runner. # handle running locally, or docker in docker via gitea runner.
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}"
VOLUME_OPTS="--volumes-from=${GITEA_CONTAINER_NAME}" VOLUME_OPTS=("--volumes-from=${GITEA_CONTAINER_NAME}")
WORKING_DIR="-w ${GITHUB_WORKSPACE}/${PROJECT}" WORKING_DIR=("-w" "${GITHUB_WORKSPACE}/${PROJECT}")
BUILD_DIR="${GITHUB_WORKSPACE}/${PROJECT}/build"
OUTPUT_DIR="${GITHUB_WORKSPACE}/${PROJECT}/output"
else else
VOLUME_OPTS="-v ${SCRIPT_DIR}:/app" VOLUME_OPTS=("-v" "${SCRIPT_DIR}:/app")
WORKING_DIR="-w /app" WORKING_DIR=("-w" "/app")
BUILD_DIR="${SCRIPT_DIR}/build"
OUTPUT_DIR="${SCRIPT_DIR}/output"
fi fi
# Create output directory
mkdir -p "${OUTPUT_DIR}"
# Run build in container with mounted directories # Run build in container with mounted directories
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} \
@ -27,12 +34,19 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./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)" \
"${VOLUME_OPTS}" \ "${VOLUME_OPTS[@]}" \
"${WORKING_DIR}" \ "${WORKING_DIR[@]}" \
-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 "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found" # Copy built executable to output directory
if [ -f "${BUILD_DIR}/${PROJECT}" ]; then
cp "${BUILD_DIR}/${PROJECT}" "${OUTPUT_DIR}/"
echo "✓ Build successful - ${PROJECT} copied to ${OUTPUT_DIR}/"
else
echo "✗ Build failed - ${PROJECT} not found in ${BUILD_DIR}/"
exit 1
fi
echo "Build complete" echo "Build complete"

16
getpkg/build.sh
View File

@ -13,11 +13,18 @@ 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}"
VOLUME_OPTS=("--volumes-from=${GITEA_CONTAINER_NAME}") VOLUME_OPTS=("--volumes-from=${GITEA_CONTAINER_NAME}")
WORKING_DIR=("-w" "${GITHUB_WORKSPACE}/${PROJECT}") WORKING_DIR=("-w" "${GITHUB_WORKSPACE}/${PROJECT}")
BUILD_DIR="${GITHUB_WORKSPACE}/${PROJECT}/build"
OUTPUT_DIR="${GITHUB_WORKSPACE}/${PROJECT}/output"
else else
VOLUME_OPTS=("-v" "${SCRIPT_DIR}:/app") VOLUME_OPTS=("-v" "${SCRIPT_DIR}:/app")
WORKING_DIR=("-w" "/app") WORKING_DIR=("-w" "/app")
BUILD_DIR="${SCRIPT_DIR}/build"
OUTPUT_DIR="${SCRIPT_DIR}/output"
fi fi
# Create output directory
mkdir -p "${OUTPUT_DIR}"
# Run build in container with mounted directories # Run build in container with mounted directories
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} \
@ -33,6 +40,13 @@ docker run --rm \
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 "${SCRIPT_DIR}/build/${PROJECT}" ] && cp "${SCRIPT_DIR}/build/${PROJECT}" "${SCRIPT_DIR}/output/" || echo "No output file found" # Copy built executable to output directory
if [ -f "${BUILD_DIR}/${PROJECT}" ]; then
cp "${BUILD_DIR}/${PROJECT}" "${OUTPUT_DIR}/"
echo "✓ Build successful - ${PROJECT} copied to ${OUTPUT_DIR}/"
else
echo "✗ Build failed - ${PROJECT} not found in ${BUILD_DIR}/"
exit 1
fi
echo "Build complete" echo "Build complete"