v0.1.18 - Add automatic cleanup of dynamic build artifacts after static builds
This commit is contained in:
@@ -49,7 +49,22 @@ if [[ $FOLLOW_LOGS -eq 1 ]]; then
|
||||
wait
|
||||
exit 0
|
||||
fi
|
||||
FCGI_BINARY="./build/ginxsom-fcgi"
|
||||
# Detect architecture for static binary name
|
||||
ARCH=$(uname -m)
|
||||
case "$ARCH" in
|
||||
x86_64) STATIC_BINARY="./build/ginxsom-fcgi_static_x86_64" ;;
|
||||
aarch64|arm64) STATIC_BINARY="./build/ginxsom-fcgi_static_arm64" ;;
|
||||
*) STATIC_BINARY="./build/ginxsom-fcgi_static_${ARCH}" ;;
|
||||
esac
|
||||
|
||||
# Use static binary if available, fallback to dynamic
|
||||
if [ -f "$STATIC_BINARY" ]; then
|
||||
FCGI_BINARY="$STATIC_BINARY"
|
||||
echo "Using static binary: $FCGI_BINARY"
|
||||
else
|
||||
FCGI_BINARY="./build/ginxsom-fcgi"
|
||||
echo "Static binary not found, using dynamic binary: $FCGI_BINARY"
|
||||
fi
|
||||
SOCKET_PATH="/tmp/ginxsom-fcgi.sock"
|
||||
PID_FILE="/tmp/ginxsom-fcgi.pid"
|
||||
NGINX_CONFIG="config/local-nginx.conf"
|
||||
@@ -173,21 +188,24 @@ fi
|
||||
|
||||
echo -e "${GREEN}FastCGI cleanup complete${NC}"
|
||||
|
||||
# Step 3: Always rebuild FastCGI binary with clean build
|
||||
echo -e "\n${YELLOW}3. Rebuilding FastCGI binary (clean build)...${NC}"
|
||||
echo "Embedding web files..."
|
||||
./scripts/embed_web_files.sh
|
||||
# Step 3: Always rebuild FastCGI binary with static build
|
||||
echo -e "\n${YELLOW}3. Rebuilding FastCGI binary (static build)...${NC}"
|
||||
echo "Building static binary with Docker..."
|
||||
make static
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "${RED}Web file embedding failed! Cannot continue.${NC}"
|
||||
echo -e "${RED}Static build failed! Cannot continue.${NC}"
|
||||
echo -e "${RED}Docker must be available and running for static builds.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
echo "Performing clean rebuild to ensure all changes are compiled..."
|
||||
make clean && make
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "${RED}Build failed! Cannot continue.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
echo -e "${GREEN}Clean rebuild complete${NC}"
|
||||
|
||||
# Update FCGI_BINARY to use the newly built static binary
|
||||
ARCH=$(uname -m)
|
||||
case "$ARCH" in
|
||||
x86_64) FCGI_BINARY="./build/ginxsom-fcgi_static_x86_64" ;;
|
||||
aarch64|arm64) FCGI_BINARY="./build/ginxsom-fcgi_static_arm64" ;;
|
||||
*) FCGI_BINARY="./build/ginxsom-fcgi_static_${ARCH}" ;;
|
||||
esac
|
||||
echo -e "${GREEN}Static build complete: $FCGI_BINARY${NC}"
|
||||
|
||||
# Step 3.5: Clean database directory for fresh testing
|
||||
echo -e "\n${YELLOW}3.5. Cleaning database directory...${NC}"
|
||||
|
||||
Reference in New Issue
Block a user