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 16s
Details
Build-Test-Publish / build (linux/arm64) (push) Failing after 26s
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 21:17:31 +12:00
parent decf16da7f
commit d27904ec05
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dehydrate/build.sh
View File

@ -9,10 +9,13 @@ PROJECT="$(basename "$(dirname "${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"
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
VOLUME_OPTS="--volumes-from=${GITEA_CONTAINER_NAME}"
WORKING_DIR="-w ${GITHUB_WORKSPACE}/${PROJECT}"
else
VOLUME_OPTS="-v ${SCRIPT_DIR}:/app"
WORKING_DIR="-w /app"
fi
# Run build in container with mounted directories
@ -21,10 +24,11 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
-DPROJECT_NAME=${PROJECT} && \
cmake --build ./build"
echo "Building in new docker container"
docker run --rm \
echo "Building in new docker container"
docker run --rm \
--user "$(id -u):$(id -g)" \
"${MOUNT_CMD}" \
"${VOLUME_OPTS}" \
"${WORKING_DIR}" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \
bash -c "${COMMAND_TO_RUN}"

14
getpkg/build.sh
View File

@ -9,10 +9,13 @@ PROJECT="$(basename "$(dirname "${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"
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
MOUNT_CMD="--volumes-from=${GITEA_CONTAINER_NAME} -w ${GITHUB_WORKSPACE}/${PROJECT}"
VOLUME_OPTS=("--volumes-from=${GITEA_CONTAINER_NAME}")
WORKING_DIR=("-w" "${GITHUB_WORKSPACE}/${PROJECT}")
else
VOLUME_OPTS=("-v" "${SCRIPT_DIR}:/app")
WORKING_DIR=("-w" "/app")
fi
# Run build in container with mounted directories
@ -21,10 +24,11 @@ COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
-DPROJECT_NAME=${PROJECT} && \
cmake --build ./build"
echo "Building in new docker container"
docker run --rm \
echo "Building in new docker container"
docker run --rm \
--user "$(id -u):$(id -g)" \
"${MOUNT_CMD}" \
"${VOLUME_OPTS[@]}" \
"${WORKING_DIR[@]}" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \
bash -c "${COMMAND_TO_RUN}"