Modify buildtestpublish_all.sh

bb64/CMakeLists.txt

@@ -5,7 +5,8 @@ if(NOT DEFINED PROJECT_NAME)
     message(FATAL_ERROR "PROJECT_NAME is not defined. Pass it via -DPROJECT_NAME=<name>")
 endif()
 
-project(${PROJECT_NAME})
+string(TIMESTAMP PROJECT_VERSION "%Y.%m%d.%H%M")
+project(${PROJECT_NAME} VERSION ${PROJECT_VERSION} LANGUAGES CXX)
 
 # Build configuration
 set(CMAKE_CXX_STANDARD 23)
@@ -21,6 +22,8 @@ add_executable(${PROJECT_NAME}
     src/b64ed.cpp
 )
 
+# Configure version.hpp
+configure_file("src/version.hpp.in" "src/autogen/version.hpp" @ONLY)
 
 # Include directories
 target_include_directories(${PROJECT_NAME} PRIVATE 

bb64/publish.sh

@@ -12,19 +12,10 @@ if [ "$ARCH" = "aarch64" ]; then
     ARCH_ALIAS="arm64"
 fi
 
-# Increment version
-VERSION_FILE="${SCRIPT_DIR}/src/version.h"
-if [ ! -f "${VERSION_FILE}" ]; then
-    echo "${VERSION_FILE} not found!" >&2
-    exit 1
-else
-    v=$(cat "${VERSION_FILE}" | grep -o 'static const char \*VERSION = "[0-9.]*";' | cut -d'"' -f2)
-    oldv=$v
-    v=$((v+1))  
-    echo "Incrementing version from $oldv to $v" >&2
-    echo "static const char *VERSION = \"$v\";" > "${VERSION_FILE}"
-fi
-TAG="v$v"
+# Get version from CMake timestamp
+VERSION=$(date +"%Y.%m%d.%H%M")
+TAG="v$VERSION"
+echo "Building version $VERSION" >&2
 
 # build release version
 export CMAKE_BUILD_TYPE="Release"
@@ -77,6 +68,30 @@ if [ -z "$RELEASE_WRITE_TOKEN" ]; then
     exit 1
 fi
 
+# Create and push git tag
+echo "Creating git tag $TAG..."
+
+# Configure git identity if not set (for CI environments)
+if ! git config user.email >/dev/null 2>&1; then
+    git config user.email "ci@gitea.jde.nz"
+    git config user.name "CI Bot"
+fi
+
+# Check if tag already exists
+if git rev-parse "$TAG" >/dev/null 2>&1; then
+    echo "Tag $TAG already exists, deleting it first..."
+    git tag -d "$TAG"
+    git push origin --delete "$TAG" || true
+fi
+
+git tag -a "$TAG" -m "Release $TAG"
+if ! git push origin "$TAG"; then
+    echo "Failed to push tag $TAG to origin" >&2
+    # Try to delete local tag if push failed
+    git tag -d "$TAG"
+    exit 1
+fi
+
 echo "Creating release $TAG on Gitea..."
 RELEASE_RESPONSE=$(curl -s -X POST "$API_URL/releases" \
     -H "Content-Type: application/json" \
@@ -125,7 +140,7 @@ for FILE in ${PROJECT}.${ARCH_ALIAS} ${PROJECT}.${ARCH} install.sh; do
     fi
 done
 
-echo "Published bb64 version $v to $REPO_URL (tag $TAG) with binaries for $ARCH_ALIAS / $ARCH."
+echo "Published bb64 version $VERSION to $REPO_URL (tag $TAG) with binaries for $ARCH_ALIAS / $ARCH."
 
 
 #--------------------------------------------------------------------------------

bb64/src/bb64.cpp

@@ -5,7 +5,7 @@
 #include <cstring>
 #include <sstream>
 #include <filesystem>
-#include "version.h"
+#include "version.hpp"
 #include "b64ed.hpp"
 
 // Recursively decode and print if nested bb64 command is found

bb64/src/version.h

@@ -1 +0,0 @@
-static const char *VERSION = "39";

bb64/src/version.hpp.in

@@ -0,0 +1 @@
+static const char *VERSION = "@PROJECT_VERSION@";

buildtestpublish_all.sh

@@ -2,6 +2,15 @@
 set -uo pipefail  # Remove -e to handle errors manually
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+docker builder prune -f
+
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
 # Arrays to track results
 declare -A BUILD_RESULTS
 declare -A TEST_RESULTS
@@ -106,13 +115,35 @@ function buildtestpublish() {
     cd "$dir" || echo "Failed to cd to $dir"
 
     subtitle "🔨 BUILDING $TOOLNAME_UPPER 🔨"
-    dothis build "$dir" "$TOOLNAME"
+    if dothis build "$dir" "$TOOLNAME"; then
+        BUILD_SUCCESS=true
+    else
+        BUILD_SUCCESS=false
+    fi
 
     subtitle "🔍 TESTING $TOOLNAME_UPPER 🔍"
-    dothis test "$dir" "$TOOLNAME"
+    if [ "$BUILD_SUCCESS" = true ]; then
+        if dothis test "$dir" "$TOOLNAME"; then
+            TEST_SUCCESS=true
+        else
+            TEST_SUCCESS=false
+        fi
+    else
+        echo "Skipping tests - build failed"
+        TEST_RESULTS["$TOOLNAME"]="SKIP"
+        TEST_SUCCESS=false
+    fi
 
     subtitle "📦 PUBLISHING $TOOLNAME_UPPER 📦"
-    dothis publish "$dir" "$TOOLNAME"
+    if [ "$BUILD_SUCCESS" = true ] && [ "$TEST_SUCCESS" = true ]; then
+        dothis publish "$dir" "$TOOLNAME"
+    elif [ "$BUILD_SUCCESS" = true ] && [ "${TEST_RESULTS[$TOOLNAME]}" = "SKIP" ]; then
+        # If tests are skipped (no test script), allow publish if build succeeded
+        dothis publish "$dir" "$TOOLNAME"
+    else
+        echo "Skipping publish - build or tests failed"
+        PUBLISH_RESULTS["$TOOLNAME"]="SKIP"
+    fi
 
     echo "Done"
 }
@@ -166,9 +197,36 @@ function print_summary() {
         local test_status="${TEST_RESULTS[$project]:-'-'}"
         local publish_status="${PUBLISH_RESULTS[$project]:-'-'}"
         
-        printf "│ %-*s │ %-7s │ %-7s │ %-7s │\n" \
+        # Format status with proper spacing and colors for Unicode characters
+        local build_col test_col publish_col
+        
+        # Format build status with colors
+        case "$build_status" in
+            "✓") build_col=$(printf "   %s✓%s   " "$GREEN" "$NC") ;;
+            "✗") build_col=$(printf "   %s✗%s   " "$RED" "$NC") ;;
+            "SKIP") build_col=$(printf "   %s-%s   " "$YELLOW" "$NC") ;;
+            *) build_col="   -   " ;;
+        esac
+        
+        # Format test status with colors
+        case "$test_status" in
+            "✓") test_col=$(printf "   %s✓%s   " "$GREEN" "$NC") ;;
+            "✗") test_col=$(printf "   %s✗%s   " "$RED" "$NC") ;;
+            "SKIP") test_col=$(printf "   %s-%s   " "$YELLOW" "$NC") ;;
+            *) test_col="   -   " ;;
+        esac
+        
+        # Format publish status with colors
+        case "$publish_status" in
+            "✓") publish_col=$(printf "   %s✓%s   " "$GREEN" "$NC") ;;
+            "✗") publish_col=$(printf "   %s✗%s   " "$RED" "$NC") ;;
+            "SKIP") publish_col=$(printf "   %s-%s   " "$YELLOW" "$NC") ;;
+            *) publish_col="   -   " ;;
+        esac
+        
+        printf "│ %-*s │%b│%b│%b│\n" \
             $max_project_width "$project" \
-            "$build_status" "$test_status" "$publish_status"
+            "$build_col" "$test_col" "$publish_col"
     done
     
     # Print bottom border

dehydrate/src/argparse.cpp

@@ -17,12 +17,19 @@ Examples:
   dehydrate src/ output/        Creates _src.cpp and _src.hpp in output/
   dehydrate -u                  Updates dehydrate to the latest version
   dehydrate -v                  Shows version number
+  dehydrate version             Shows version number
 )";
 
 Args parse_args(int argc, char* argv[]) {
     Args args;
     int idx = 1;
     
+    // Check for "version" as first argument (no dash)
+    if (argc > 1 && std::string(argv[1]) == "version") {
+        args.version = true;
+        return args;
+    }
+    
     // Parse flags
     while (idx < argc && argv[idx][0] == '-') {
         std::string flag = argv[idx];

dehydrate/test/build_dehydrate_test.sh

@@ -16,39 +16,48 @@ rm -f dehydrate_test
 
 # Build the test program using Docker
 # The Docker container supports both amd64 and arm64 architectures
-docker run --rm \
-    -v "$PROJECT_DIR":/workdir \
-    -w /workdir/test \
+echo "Building dehydrate test executable..."
+
+# Use docker cp approach since volume mounting may not work in CI
+CONTAINER_NAME="dehydrate-test-build-$$"
+
+# Start container in detached mode
+docker run -d --name "$CONTAINER_NAME" \
     gitea.jde.nz/public/dropshell-build-base:latest \
-    bash -c "
-        # Verify we can find the source file
-        if [ ! -f dehydrate_test.cpp ]; then
-            echo 'ERROR: dehydrate_test.cpp not found in current directory'
-            echo 'Working directory:' && pwd
-            echo 'Available files:' && ls -la
-            exit 1
-        fi
+    sleep 60
 
-        # Clean any existing binary and compile
-        rm -f dehydrate_test
-        if ! g++ -std=c++23 -static dehydrate_test.cpp -o dehydrate_test; then
-            echo 'ERROR: Compilation failed'
-            exit 1
-        fi
+# Copy source file into container
+docker cp dehydrate_test.cpp "$CONTAINER_NAME":/dehydrate_test.cpp
 
-        # Verify binary was created and is executable
-        if [ ! -f dehydrate_test ]; then
-            echo 'ERROR: Binary was not created'
-            exit 1
-        fi
+# Compile in container
+docker exec "$CONTAINER_NAME" bash -c "
+    echo 'Compiling dehydrate test...'
+    if ! g++ -std=c++23 -static /dehydrate_test.cpp -o /dehydrate_test; then
+        echo 'ERROR: Compilation failed'
+        exit 1
+    fi
     
-        # Quick architecture check - just verify the binary format
-        if ! file dehydrate_test | grep -q 'executable'; then
-            echo 'ERROR: Generated file is not an executable'
-            file dehydrate_test
-            exit 1
-        fi
-    "
+    # Verify binary was created
+    if [ ! -f /dehydrate_test ]; then
+        echo 'ERROR: Binary was not created'
+        exit 1
+    fi
+    
+    # Quick architecture check
+    if ! file /dehydrate_test | grep -q 'executable'; then
+        echo 'ERROR: Generated file is not an executable'
+        file /dehydrate_test
+        exit 1
+    fi
+    
+    echo 'Compilation successful'
+"
+
+# Copy binary back to host
+docker cp "$CONTAINER_NAME":/dehydrate_test ./dehydrate_test
+
+# Clean up container
+docker rm -f "$CONTAINER_NAME"
 
 # Check if compilation succeeded
 if [ ! -f "./dehydrate_test" ]; then