test: 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:
@ -109,7 +109,7 @@ function buildtestpublish() {
|
|||||||
# Add to projects list
|
# Add to projects list
|
||||||
PROJECTS+=("$TOOLNAME")
|
PROJECTS+=("$TOOLNAME")
|
||||||
|
|
||||||
cd "$dir" || echo "Failed to cd to $dir"
|
#cd "$dir" || echo "Failed to cd to $dir"
|
||||||
|
|
||||||
subtitle "🔨 BUILDING $TOOLNAME_UPPER 🔨"
|
subtitle "🔨 BUILDING $TOOLNAME_UPPER 🔨"
|
||||||
if dothis build "$dir" "$TOOLNAME"; then
|
if dothis build "$dir" "$TOOLNAME"; then
|
||||||
|
@ -2,27 +2,12 @@
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Get script directory - handle different execution contexts
|
# Get script directory - handle different execution contexts
|
||||||
if [ -n "${BASH_SOURCE[0]}" ]; then
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||||
else
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "$0" )" &> /dev/null && pwd )"
|
|
||||||
fi
|
|
||||||
PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
|
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}"
|
||||||
|
|
||||||
MAIN_DIR="${SCRIPT_DIR}"
|
|
||||||
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
|
|
||||||
MAIN_DIR="/runner/${PROJECT}"
|
|
||||||
|
|
||||||
mkdir -p "${MAIN_DIR}"
|
|
||||||
cp -r "${SCRIPT_DIR}/*" "${MAIN_DIR}/"
|
|
||||||
mkdir -p "${MAIN_DIR}/build"
|
|
||||||
mkdir -p "${MAIN_DIR}/output"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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,16 +18,9 @@ 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)" \
|
||||||
-v "${MAIN_DIR}:/app:ro" \
|
-v "${SCRIPT_DIR}:/app" \
|
||||||
-v "${MAIN_DIR}/build:/app/build" \
|
|
||||||
-v "${MAIN_DIR}/output:/app/output" \
|
|
||||||
-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 "cd /app && ${COMMAND_TO_RUN}"
|
||||||
|
|
||||||
if [ -n "${GITEA_CONTAINER_NAME:-}" ]; then
|
|
||||||
cp -r "${MAIN_DIR}/output/*" "${SCRIPT_DIR}/output/"
|
|
||||||
rm -rf "${MAIN_DIR}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Build complete"
|
echo "Build complete"
|
||||||
|
Reference in New Issue
Block a user