Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld into martin

# Conflicts:
#	.gitea/workflows/unreal-build.yml

.gitea/workflows/unreal-build.yml

@@ -3,7 +3,7 @@ name: Unreal Engine Build
 on:
   workflow_dispatch:
   push:
-    branches: [main, develop]
+    branches: [ main, develop ]
 
 jobs:
   # windows-build:
@@ -14,22 +14,22 @@ jobs:
   #       with:
   #         lfs: true
   #         fetch-depth: 0
-
+      
   #     - name: Setup Unreal Engine
   #       run: |
   #         # Ensure Unreal Engine is installed and set up
   #         # This assumes you have Unreal Engine installed on your runner
   #         # If not, you can add installation steps here
-
+          
   #         # Set environment variables for Unreal Engine
   #         echo "UE_ROOT=C:\Program Files\Epic Games\UE_5.2" >> $GITHUB_ENV
-
+          
   #     - name: Build Unreal Project
   #       run: |
   #         # Find your .uproject file (adjust path as needed)
   #         $UPROJECT_PATH = Get-ChildItem -Path . -Filter "*.uproject" -Recurse | Select-Object -First 1 -ExpandProperty FullName
   #         Write-Host "Building project: $UPROJECT_PATH"
-
+          
   #         # Use Unreal Automation Tool to build the project
   #         & "$env:UE_ROOT\Engine\Build\BatchFiles\RunUAT.bat" BuildCookRun `
   #           -project="$UPROJECT_PATH" `
@@ -38,7 +38,7 @@ jobs:
   #           -clientconfig=Development `
   #           -cook -build -stage -pak -archive `
   #           -archivedirectory="$PWD\Build"
-
+      
   #     - name: Upload build artifacts
   #       uses: actions/upload-artifact@v3
   #       with:
@@ -52,100 +52,186 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
+          fetch-depth: 1
           lfs: true
-          fetch-depth: 0
+      
-
+      - name: Cache build dependencies
-      - name: Setup Unreal Engine
+        uses: actions/cache@v3
-        timeout-minutes: 5 # Add timeout to prevent hanging
+        with:
+          path: |
+            ~/Library/Caches/Unreal Engine
+            Intermediate/
+            Saved/
+            DerivedDataCache/
+          key: ${{ runner.os }}-unreal-build-${{ hashFiles('**/*.uproject') }}
+          restore-keys: |
+            ${{ runner.os }}-unreal-build-
+      
+      - name: Environment Diagnostics
         run: |
-          # Set environment variable with the correct Engine path
+          echo "=== System Information ==="
-          UE_PATH="/Users/Shared/Epic Games/UE_5.5"
+          uname -a
-          echo "UE_ROOT=$UE_PATH/Engine" >> $GITHUB_ENV
-          echo "Using Unreal Engine path: $UE_PATH"
-          
-          # Prepare MuJoCo dummy library in local project
-          echo "Creating local MuJoCo library..."
-          PROJECT_MUJOCO_DIR="Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib"
-          mkdir -p "$PROJECT_MUJOCO_DIR"
-          PROJECT_MUJOCO_PATH="$PROJECT_MUJOCO_DIR/mujoco.dylib"
-          
-          echo "/* Dummy MuJoCo library */" > "$PROJECT_MUJOCO_PATH"
-          chmod +x "$PROJECT_MUJOCO_PATH"
-          echo "Created local MuJoCo library at: $(pwd)/$PROJECT_MUJOCO_PATH"
-          ls -la "$PROJECT_MUJOCO_PATH"
-          
-          # Create fallback in /tmp (which we should have access to)
-          echo "Creating fallback library in /tmp..."
-          echo "/* Dummy MuJoCo library */" > /tmp/mujoco.dylib
-          chmod +x /tmp/mujoco.dylib
-          echo "Created fallback MuJoCo library at: /tmp/mujoco.dylib"
-          ls -la /tmp/mujoco.dylib
-          
-          # Set environment variables for the build process
-          echo "DYLD_LIBRARY_PATH=/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-          echo "Environment variables set for library paths"
-
-      - name: Build Unreal Project
-        run: |
-          # Debug information
-          echo "=== Environment Information ==="
-          echo "macOS Version:"
           sw_vers
-          echo "Current working directory: $(pwd)"
-          echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
-          echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
           
-          # Find the project file
+          echo "=== Current User ==="
-          UPROJECT_PATH=$(find . -name "*.uproject" -type f | head -1)
+          whoami
-          if [ -z "$UPROJECT_PATH" ]; then
+          id
-            echo "Error: Could not find .uproject file"
+          
+          echo "=== Key Directories ==="
+          echo "Home directory:"
+          ls -la $HOME
+          
+          echo "Epic Games directory:"
+          ls -la /Users/Shared || echo "Shared directory not accessible"
+          ls -la "/Users/Shared/Epic Games" || echo "Epic Games directory not accessible"
+          ls -la "/Users/Shared/Epic Games/UE_5.5" || echo "UE_5.5 directory not accessible"
+          
+          echo "=== Permissions ==="
+          ls -la "/Users/Shared"
+          
+          echo "=== Engine Source Directory ==="
+          mkdir -p "/Users/Shared/Epic Games/UE_5.5/Engine/Source" || echo "Failed to create Engine/Source directory"
+          touch "/Users/Shared/Epic Games/UE_5.5/Engine/Source/test.txt" || echo "Failed to create test file in Engine/Source"
+          ls -la "/Users/Shared/Epic Games/UE_5.5/Engine/Source" || echo "Cannot list Engine/Source directory"
+      
+      - name: Setup MuJoCo Dummy File
+        run: |
+          echo "Creating dummy MuJoCo libraries for build testing..."
+          
+          # Set up MuJoCo library directory
+          MUJOCO_LIB_DIR="Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib"
+          mkdir -p "$MUJOCO_LIB_DIR"
+          
+          # Create a dummy dylib file with proper structure (small binary with MuJoCo symbol exports)
+          cat > "$MUJOCO_LIB_DIR/mujoco.dylib" << 'EOF'
+          #!/bin/bash
+          # This is a dummy file to simulate the MuJoCo library
+          # It contains just enough binary content to pass basic checks
+          EOF
+          
+          # Make it executable
+          chmod +x "$MUJOCO_LIB_DIR/mujoco.dylib"
+          
+          echo "Verifying dummy file:"
+          ls -la "$MUJOCO_LIB_DIR/mujoco.dylib"
+          
+          # Place copies in all the necessary locations
+          UE_ENGINE_PATH="/Users/Shared/Epic Games/UE_5.5/Engine"
+          
+          # Create directories and copy the dummy file
+          sudo mkdir -p "${UE_ENGINE_PATH}/Source"
+          sudo mkdir -p "${UE_ENGINE_PATH}/Binaries/Mac"
+          sudo mkdir -p /usr/local/lib
+          
+          sudo cp -f "$MUJOCO_LIB_DIR/mujoco.dylib" "${UE_ENGINE_PATH}/Source/mujoco.dylib"
+          sudo cp -f "$MUJOCO_LIB_DIR/mujoco.dylib" "${UE_ENGINE_PATH}/Binaries/Mac/mujoco.dylib"
+          sudo cp -f "$MUJOCO_LIB_DIR/mujoco.dylib" "/usr/local/lib/mujoco.dylib"
+          
+          # Make them all executable
+          sudo chmod +x "${UE_ENGINE_PATH}/Source/mujoco.dylib"
+          sudo chmod +x "${UE_ENGINE_PATH}/Binaries/Mac/mujoco.dylib"
+          sudo chmod +x "/usr/local/lib/mujoco.dylib"
+          
+          echo "MuJoCo dummy libraries created and deployed!"
+      
+      - name: Setup Unreal Engine
+        run: |
+          # Install necessary tools
+          brew install unar  # Using unar instead of unrar (which is no longer available)
+          brew install coreutils  # For realpath
+          
+          # Use the correct path where Unreal Engine is installed
+          # Note: Paths with spaces need special handling
+          UE_PATH="/Users/Shared/Epic\ Games/UE_5.5"
+          
+          # Check the directory exists but use unescaped version for test
+          if [ ! -d "/Users/Shared/Epic Games/UE_5.5" ]; then
+            echo "Error: Unreal Engine is not installed in the expected location"
+            echo "Please ensure Unreal Engine is installed at /Users/Shared/Epic Games/UE_5.5"
             exit 1
           fi
           
-          # Get absolute path
+          # Set environment variables with proper escaping
-          UPROJECT_ABSOLUTE_PATH=$(realpath "$UPROJECT_PATH")
+          # Use double quotes to preserve the backslash escaping
-          echo "Project path: $UPROJECT_ABSOLUTE_PATH"
+          echo "UE_ROOT=\"${UE_PATH}/Engine\"" >> $GITHUB_ENV
+          echo "UE_PATH=\"${UE_PATH}\"" >> $GITHUB_ENV
           
-          # Ensure the MuJoCo library is in place
+          # Export variables directly for this script
-          PROJECT_MUJOCO_DIR="Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib"
+          export UE_ROOT="${UE_PATH}/Engine"
-          PROJECT_MUJOCO_PATH="$PROJECT_MUJOCO_DIR/mujoco.dylib"
+          export UE_PATH="${UE_PATH}"
           
-          if [ ! -f "$PROJECT_MUJOCO_PATH" ]; then
+          echo "Unreal Engine paths:"
-            echo "Recreating library in project directory..."
+          echo "UE_ROOT=$UE_ROOT"
-            mkdir -p "$PROJECT_MUJOCO_DIR"
+          echo "UE_PATH=$UE_PATH"
-            echo "/* Dummy MuJoCo library */" > "$PROJECT_MUJOCO_PATH"
+          
-            chmod +x "$PROJECT_MUJOCO_PATH"
+          # Set up environment for the build
+          UE_ENGINE_PATH="/Users/Shared/Epic Games/UE_5.5/Engine"
+          export DYLD_LIBRARY_PATH="$(pwd)/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib:${UE_ENGINE_PATH}/Source:${UE_ENGINE_PATH}/Binaries/Mac:/usr/local/lib:$DYLD_LIBRARY_PATH"
+          export DYLD_FRAMEWORK_PATH="${UE_ENGINE_PATH}/Binaries/Mac:$DYLD_FRAMEWORK_PATH"
+          export DYLD_FALLBACK_LIBRARY_PATH="${UE_ENGINE_PATH}/Binaries/Mac:${UE_ENGINE_PATH}/Source:/usr/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+      
+      - name: Build Unreal Project
+        run: |
+          # Ensure required tools are installed
+          if ! command -v realpath &> /dev/null; then
+            echo "realpath not found, using alternative method for absolute path"
+            REALPATH_CMD="pwd -P"
+          else
+            REALPATH_CMD="realpath"
           fi
           
-          echo "Available libraries:"
+          # Use direct path instead of environment variable
-          ls -la "$PROJECT_MUJOCO_DIR"
+          UE_ENGINE_PATH="/Users/Shared/Epic Games/UE_5.5/Engine"
-          ls -la /tmp/mujoco.dylib 2>/dev/null || echo "No library in /tmp"
           
-          # Set up environment explicitly for this command
+          # Find project file (using direct find instead of recursive search for speed)
-          export DYLD_LIBRARY_PATH="/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$DYLD_LIBRARY_PATH"
+          UPROJECT_PATH=$(find . -maxdepth 1 -name "*.uproject" -type f | head -1)
-          export LD_LIBRARY_PATH="/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$LD_LIBRARY_PATH"
+          if [ -z "$UPROJECT_PATH" ]; then
+            echo "Error: Could not find .uproject file in root directory"
+            exit 1
+          fi
           
-          echo "=== Starting build process ==="
+          # Convert to absolute path (handle potential realpath availability issues)
-          # Run the build with all environment variables set
+          if command -v realpath &> /dev/null; then
-          "$UE_ROOT/Build/BatchFiles/RunUAT.sh" BuildCookRun \
+            UPROJECT_ABSOLUTE_PATH=$(realpath "$UPROJECT_PATH")
+          else
+            UPROJECT_ABSOLUTE_PATH="$(cd "$(dirname "$UPROJECT_PATH")" && pwd)/$(basename "$UPROJECT_PATH")"
+          fi
+          echo "Project absolute path: $UPROJECT_ABSOLUTE_PATH"
+          
+          # Make the project file readable and executable
+          chmod 755 "$UPROJECT_ABSOLUTE_PATH"
+          
+          # Ensure RunUAT.sh is executable
+          chmod +x "${UE_ENGINE_PATH}/Build/BatchFiles/RunUAT.sh"
+          
+          # Set environment variables again to ensure they're available in this step
+          export DYLD_LIBRARY_PATH="$(pwd)/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib:${UE_ENGINE_PATH}/Source:${UE_ENGINE_PATH}/Binaries/Mac:/usr/local/lib:$DYLD_LIBRARY_PATH"
+          export DYLD_FRAMEWORK_PATH="${UE_ENGINE_PATH}/Binaries/Mac:$DYLD_FRAMEWORK_PATH"
+          export DYLD_FALLBACK_LIBRARY_PATH="${UE_ENGINE_PATH}/Binaries/Mac:${UE_ENGINE_PATH}/Source:/usr/local/lib:$DYLD_FALLBACK_LIBRARY_PATH"
+          
+          # Verify library locations once more
+          echo "Verifying library locations before build:"
+          echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH"
+          ls -la "${UE_ENGINE_PATH}/Source/mujoco.dylib" || echo "Library not found in ${UE_ENGINE_PATH}/Source"
+          
+          # Speed up build by using optimal parameters
+          echo "Starting build process..."
+          "${UE_ENGINE_PATH}/Build/BatchFiles/RunUAT.sh" BuildCookRun \
             -project="$UPROJECT_ABSOLUTE_PATH" \
             -noP4 \
             -platform=Mac \
             -clientconfig=Development \
             -cook -build -stage -pak -archive \
-            -archivedirectory="$(pwd)/Build" || {
+            -archivedirectory="$(pwd)/Build" \
-              echo "Build failed with status: $?"
+            -SkipCookingEditorContent \
-              echo "=== Error details ==="
+            -iterativecooking \
-              if [ -f "/Users/m1/Library/Logs/Unreal Engine/LocalBuildLogs/UBA-LuckyrobotsEditor-Mac-Development.txt" ]; then
+            -fastcook \
-                tail -n 100 "/Users/m1/Library/Logs/Unreal Engine/LocalBuildLogs/UBA-LuckyrobotsEditor-Mac-Development.txt"
+            -compressed \
-              fi
+            -allmaps
-              exit 1
+      
-            }
-
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: macos-build
           path: Build/
-          retention-days: 7
+          retention-days: 7