config: Update 3 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,31 +17,12 @@ mkdir -p "${SCRIPT_DIR}/build"
|
||||
mkdir -p "${SCRIPT_DIR}/output"
|
||||
|
||||
# Run build in container with mounted directories
|
||||
COMMAND_TO_RUN="
|
||||
cmake -G Ninja -S . -B ./build \
|
||||
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
||||
-DPROJECT_NAME=${PROJECT} && \
|
||||
cmake --build ./build && \
|
||||
cp ./build/${PROJECT} ./output/
|
||||
"
|
||||
COMMAND_TO_RUN="cmake -G Ninja -S . -B ./build \
|
||||
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
|
||||
-DPROJECT_NAME=${PROJECT} && \
|
||||
cmake --build ./build && \
|
||||
cp ./build/${PROJECT} ./output/"
|
||||
|
||||
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
|
||||
echo "We're in a gitea container: ${GITEA_CONTAINER_NAME}"
|
||||
echo "Checking cmake availability..."
|
||||
if which cmake >/dev/null 2>&1; then
|
||||
echo "cmake found, building directly"
|
||||
cd "${SCRIPT_DIR}" && ${COMMAND_TO_RUN}
|
||||
else
|
||||
echo "cmake not found in CI environment, using docker build instead"
|
||||
docker run --rm \
|
||||
-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
|
||||
else
|
||||
echo "Building in new docker container"
|
||||
docker run --rm \
|
||||
--user "$(id -u):$(id -g)" \
|
||||
@ -51,6 +32,5 @@ else
|
||||
-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