test: Update 5 files

dehydrate/Dockerfile.dropshell-build

@@ -1,65 +0,0 @@
-ARG IMAGE_TAG
-FROM gitea.jde.nz/public/dropshell-build-base:latest AS builder
-
-ARG PROJECT
-ARG CMAKE_BUILD_TYPE=Debug
-
-# Set working directory
-WORKDIR /app
-
-SHELL ["/bin/bash", "-c"]
-
-# Create cache directories
-RUN mkdir -p /ccache
-
-# Set up ccache
-ENV CCACHE_DIR=/ccache
-ENV CCACHE_COMPILERCHECK=content
-ENV CCACHE_MAXSIZE=2G
-
-# Copy build files
-COPY CMakeLists.txt ./
-COPY src/version.hpp.in src/
-
-# Copy source files
-COPY src/ src/
-COPY contrib/ contrib/
-
-# Configure project
-RUN --mount=type=cache,target=/ccache \
-    --mount=type=cache,target=/build \
-    mkdir -p /build && \
-    cmake -G Ninja -S /app -B /build \
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \
-    -DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \
-    -DCMAKE_C_FLAGS="-g -fno-omit-frame-pointer" \
-    -DPROJECT_NAME="${PROJECT}" \
-    -DCMAKE_STRIP=OFF \
-    ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
-
-# Build project
-RUN --mount=type=cache,target=/ccache \
-    --mount=type=cache,target=/build \
-    cmake --build /build
-
-# Copy the built executable to a regular directory for the final stage
-RUN --mount=type=cache,target=/build \
-    mkdir -p /output && \
-    find /build -type f -executable -name "*${PROJECT}*" -exec cp {} /output/${PROJECT} \; || \
-    find /build -type f -executable -exec cp {} /output/${PROJECT} \;
-
-# if we're a release build, then run upx on the binary.
-RUN if [ "${CMAKE_BUILD_TYPE}" = "Release" ]; then \
-        upx /output/${PROJECT}; \
-    fi
-
-# Final stage that only contains the binary
-FROM scratch AS project
-
-ARG PROJECT
-
-# Copy the actual binary from the regular directory
-COPY --from=builder /output/${PROJECT} /${PROJECT}

dehydrate/build.sh

@@ -1,29 +1,26 @@
 #!/bin/bash
-
+# build.sh using docker run approach
-set -euo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 PROJECT="dehydrate"
 
-export CMAKE_BUILD_TYPE="Debug"
+# Create persistent build directory
-
+mkdir -p "${SCRIPT_DIR}/build"
-rm -rf "${SCRIPT_DIR}/output" 
 mkdir -p "${SCRIPT_DIR}/output"
 
-# make sure we have the latest base image.
+# Run build in container with mounted directories
-docker pull gitea.jde.nz/public/dropshell-build-base:latest
+docker run --rm \
-
+  --user "$(id -u):$(id -g)" \
-# Build with or without cache based on NO_CACHE environment variable
+  -v "${SCRIPT_DIR}:/src:ro" \
-CACHE_FLAG=""
+  -v "${SCRIPT_DIR}/build:/build" \
-if [ "${NO_CACHE:-false}" = "true" ]; then
+  -v "${SCRIPT_DIR}/output:/output" \
-    CACHE_FLAG="--no-cache"
+  -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
-fi
+  gitea.jde.nz/public/dropshell-build-base:latest \
-
+  bash -c "
-docker build \
+    cd /build && \
-  ${CACHE_FLAG} \
+    cmake -G Ninja -S /src -B . \
-  -t "${PROJECT}-build" \
+      -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-  -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
+      -DPROJECT_NAME=${PROJECT} && \
-  --build-arg PROJECT="${PROJECT}" \
+    cmake --build . && \
-  --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
+    cp ${PROJECT} /output/
-  --output "${SCRIPT_DIR}/output" \
+  "
-  "${SCRIPT_DIR}"

dehydrate/clean.sh

@@ -7,18 +7,12 @@ PROJECT="dehydrate"
 
 echo "Cleaning ${PROJECT}..."
 
-# Remove output directory
+# Remove output and build directories
-if [ -d "${SCRIPT_DIR}/output" ]; then
+for dir in "output" "build"; do
-    echo "Removing output directory..."
+    if [ -d "${SCRIPT_DIR}/${dir}" ]; then
-    rm -rf "${SCRIPT_DIR}/output"
+        echo "Removing ${dir} directory..."
-fi
+        rm -rf "${SCRIPT_DIR:?}/${dir}"
-
+    fi
-# Remove Docker images related to this project
+done
-echo "Removing Docker images..."
-docker images --filter "reference=${PROJECT}-build*" -q | xargs -r docker rmi -f
-
-# Remove Docker build cache
-echo "Pruning Docker build cache..."
-docker builder prune -f
 
 echo "✓ ${PROJECT} cleaned successfully"

dehydrate/publish.sh

@@ -35,21 +35,7 @@ heading "Building ${PROJECT}"
 
 # build release version
 export CMAKE_BUILD_TYPE="Release"
-
+"${SCRIPT_DIR}/build.sh"
-# Build with or without cache based on NO_CACHE environment variable
-CACHE_FLAG=""
-if [ "${NO_CACHE:-false}" = "true" ]; then
-    CACHE_FLAG="--no-cache"
-fi
-
-docker build \
-  ${CACHE_FLAG} \
-  -t "${PROJECT}-build" \
-  -f "${SCRIPT_DIR}/Dockerfile.dropshell-build" \
-  --build-arg PROJECT="${PROJECT}" \
-  --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
-  --output "${OUTPUT}" \
-  "${SCRIPT_DIR}"
 
 [ -f "${OUTPUT}/${PROJECT}" ] || die "Build failed."
 

dehydrate/test/build_dehydrate_test.sh

@@ -4,7 +4,7 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROJECT_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
 
-cd "$SCRIPT_DIR"
+cd "$SCRIPT_DIR" || exit 1
 
 # Clean up old test data and any existing binaries
 # Force removal with chmod to handle permission issues