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 8s
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
Some checks failed
Build-Test-Publish / build (linux/amd64) (push) Failing after 7s
Build-Test-Publish / build (linux/arm64) (push) Failing after 8s
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:
@ -17,20 +17,27 @@ mkdir -p "${SCRIPT_DIR}/build"
|
|||||||
mkdir -p "${SCRIPT_DIR}/output"
|
mkdir -p "${SCRIPT_DIR}/output"
|
||||||
|
|
||||||
# Run build in container with mounted directories
|
# Run build in container with mounted directories
|
||||||
docker run --rm \
|
COMMAND_TO_RUN="
|
||||||
--user "$(id -u):$(id -g)" \
|
cmake -G Ninja -S . -B ./build \
|
||||||
${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
|
|
||||||
-v "${SCRIPT_DIR}:/app:ro" \
|
|
||||||
-v "${SCRIPT_DIR}/build:/build" \
|
|
||||||
-v "${SCRIPT_DIR}/output:/output" \
|
|
||||||
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
|
|
||||||
gitea.jde.nz/public/dropshell-build-base:latest \
|
|
||||||
bash -c "
|
|
||||||
ls -la /app &&
|
|
||||||
cd /build && \
|
|
||||||
cmake -G Ninja -S /app -B . \
|
|
||||||
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
||||||
-DPROJECT_NAME=${PROJECT} && \
|
-DPROJECT_NAME=${PROJECT} && \
|
||||||
cmake --build . && \
|
cmake --build ./build && \
|
||||||
cp ${PROJECT} /output/
|
cp ./build/${PROJECT} ./output/
|
||||||
"
|
"
|
||||||
|
|
||||||
|
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
|
||||||
|
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
|
||||||
|
cd "${SCRIPT_DIR}" && ls -la . && ${COMMAND_TO_RUN}
|
||||||
|
else
|
||||||
|
echo "Building in new docker container"
|
||||||
|
docker run --rm \
|
||||||
|
--user "$(id -u):$(id -g)" \
|
||||||
|
-v "${SCRIPT_DIR}:/app:ro" \
|
||||||
|
-v "${SCRIPT_DIR}/build:/app/build" \
|
||||||
|
-v "${SCRIPT_DIR}/output:/app/output" \
|
||||||
|
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
|
||||||
|
gitea.jde.nz/public/dropshell-build-base:latest \
|
||||||
|
bash -c "cd /app &&${COMMAND_TO_RUN}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Build complete"
|
@ -17,20 +17,27 @@ mkdir -p "${SCRIPT_DIR}/build"
|
|||||||
mkdir -p "${SCRIPT_DIR}/output"
|
mkdir -p "${SCRIPT_DIR}/output"
|
||||||
|
|
||||||
# Run build in container with mounted directories
|
# Run build in container with mounted directories
|
||||||
docker run --rm \
|
COMMAND_TO_RUN="
|
||||||
--user "$(id -u):$(id -g)" \
|
cmake -G Ninja -S . -B ./build \
|
||||||
${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
|
|
||||||
-v "${SCRIPT_DIR}:/app:ro" \
|
|
||||||
-v "${SCRIPT_DIR}/build:/build" \
|
|
||||||
-v "${SCRIPT_DIR}/output:/output" \
|
|
||||||
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
|
|
||||||
gitea.jde.nz/public/dropshell-build-base:latest \
|
|
||||||
bash -c "
|
|
||||||
ls -la /app &&
|
|
||||||
cd /build && \
|
|
||||||
cmake -G Ninja -S /app -B . \
|
|
||||||
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
||||||
-DPROJECT_NAME=${PROJECT} && \
|
-DPROJECT_NAME=${PROJECT} && \
|
||||||
cmake --build . && \
|
cmake --build ./build && \
|
||||||
cp ${PROJECT} /output/
|
cp ./build/${PROJECT} ./output/
|
||||||
"
|
"
|
||||||
|
|
||||||
|
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
|
||||||
|
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
|
||||||
|
cd "${SCRIPT_DIR}" && ls -la . && ${COMMAND_TO_RUN}
|
||||||
|
else
|
||||||
|
echo "Building in new docker container"
|
||||||
|
docker run --rm \
|
||||||
|
--user "$(id -u):$(id -g)" \
|
||||||
|
-v "${SCRIPT_DIR}:/app:ro" \
|
||||||
|
-v "${SCRIPT_DIR}/build:/app/build" \
|
||||||
|
-v "${SCRIPT_DIR}/output:/app/output" \
|
||||||
|
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
|
||||||
|
gitea.jde.nz/public/dropshell-build-base:latest \
|
||||||
|
bash -c "cd /app &&${COMMAND_TO_RUN}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Build complete"
|
Reference in New Issue
Block a user