Merge branches 'main' and 'main' of ssh://luckyrobots.com:2222/luckyrobots/luckyworld

.gitea/workflows/unreal-build.yml

@@ -4,8 +4,6 @@ on:
   workflow_dispatch:
   push:
     branches: [ main, develop ]
-  pull_request:
-    branches: [ main, develop ]
 
 jobs:
   # windows-build:
@@ -54,71 +52,167 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
+          fetch-depth: 1
           lfs: true
-          fetch-depth: 0
+          # Remove sparse checkout as it's not supported in older Git versions
+          # We'll use a full checkout with shallow depth for speed
+      
+      - name: Cache build dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/Library/Caches/Unreal Engine
+            Intermediate/
+            Saved/
+            DerivedDataCache/
+          key: ${{ runner.os }}-unreal-build-${{ hashFiles('**/*.uproject') }}
+          restore-keys: |
+            ${{ runner.os }}-unreal-build-
       
       - name: Setup Unreal Engine
         run: |
-          # Use the correct path where Unreal Engine is installed
+          # Install necessary tools
-          UE_PATH="/Users/Shared/Epic Games/UE_5.5"
+          brew install unrar 
+          brew install coreutils  # For realpath
           
-          if [ ! -d "$UE_PATH" ]; then
+          # 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 $UE_PATH"
+            echo "Please ensure Unreal Engine is installed at /Users/Shared/Epic Games/UE_5.5"
             exit 1
           fi
           
-          # Set environment variable with the correct Engine path
+          # Set environment variables with proper escaping
-          echo "UE_ROOT=$UE_PATH/Engine" >> $GITHUB_ENV
+          # Use double quotes to preserve the backslash escaping
-          echo "Using Unreal Engine 5.5"
+          echo "UE_ROOT=\"${UE_PATH}/Engine\"" >> $GITHUB_ENV
+          echo "UE_PATH=\"${UE_PATH}\"" >> $GITHUB_ENV
+          
+          # Export variables directly for this script
+          export UE_ROOT="${UE_PATH}/Engine"
+          export UE_PATH="${UE_PATH}"
+          
+          echo "Unreal Engine paths:"
+          echo "UE_ROOT=$UE_ROOT"
+          echo "UE_PATH=$UE_PATH"
+          
+          # Set up MuJoCo library
+          MUJOCO_LIB_DIR="Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib"
+          mkdir -p "$MUJOCO_LIB_DIR"
+          
+          # Simplify MuJoCo dylib handling - download directly if needed
+          if [ ! -f "$MUJOCO_LIB_DIR/mujoco.dylib" ]; then
+            echo "Downloading MuJoCo directly..."
+            
+            # Download pre-built dylib for macOS (simpler approach)
+            curl -L -o "$MUJOCO_LIB_DIR/mujoco.dylib" "https://github.com/google-deepmind/mujoco/releases/download/2.3.7/mujoco-2.3.7-macos-universal2.dylib" || echo "Failed to download dylib"
+            
+            if [ ! -f "$MUJOCO_LIB_DIR/mujoco.dylib" ]; then
+              echo "Direct download failed, creating placeholder..."
+              # Create placeholder file for testing
+              touch "$MUJOCO_LIB_DIR/mujoco.dylib"
+            fi
+          else
+            echo "Using existing MuJoCo dylib"
+          fi
+          
+          chmod +x "$MUJOCO_LIB_DIR/mujoco.dylib"
+          
+          # Try multiple locations for the mujoco library
+          # 1. Create directory in Engine/Source
+          UE_ENGINE_PATH="/Users/Shared/Epic Games/UE_5.5/Engine"
+          mkdir -p "${UE_ENGINE_PATH}/Source"
+          echo "Created directory: ${UE_ENGINE_PATH}/Source"
+          
+          # 2. Copy the library directly (don't rely on symlinks)
+          if [ -f "$MUJOCO_LIB_DIR/mujoco.dylib" ]; then
+            cp "$(pwd)/$MUJOCO_LIB_DIR/mujoco.dylib" "${UE_ENGINE_PATH}/Source/"
+            echo "Copied library to: ${UE_ENGINE_PATH}/Source/mujoco.dylib"
+            
+            # 3. Also copy to Binaries/Mac directory
+            mkdir -p "${UE_ENGINE_PATH}/Binaries/Mac"
+            cp "$(pwd)/$MUJOCO_LIB_DIR/mujoco.dylib" "${UE_ENGINE_PATH}/Binaries/Mac/"
+            echo "Copied library to: ${UE_ENGINE_PATH}/Binaries/Mac/mujoco.dylib"
+            
+            # 4. Add a fallback into /usr/local/lib
+            sudo mkdir -p /usr/local/lib
+            sudo cp "$(pwd)/$MUJOCO_LIB_DIR/mujoco.dylib" /usr/local/lib/
+            echo "Copied library to: /usr/local/lib/mujoco.dylib"
+          else
+            echo "ERROR: mujoco.dylib not found in $MUJOCO_LIB_DIR"
+            echo "Attempting to create empty placeholder file for testing"
+            # Create an empty placeholder file for testing
+            touch "${UE_ENGINE_PATH}/Source/mujoco.dylib"
+            touch "${UE_ENGINE_PATH}/Binaries/Mac/mujoco.dylib"
+            sudo touch /usr/local/lib/mujoco.dylib
+          fi
+          
+          # Set up environment for the build
+          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: |
-          # Debug information
+          # Ensure required tools are installed
-          echo "=== Environment Information ==="
+          if ! command -v realpath &> /dev/null; then
-          echo "macOS Version:"
+            echo "realpath not found, using alternative method for absolute path"
-          sw_vers
+            REALPATH_CMD="pwd -P"
-          echo "Current working directory: $(pwd)"
+          else
-          ls -la  # List all files in current directory
+            REALPATH_CMD="realpath"
+          fi
           
-          echo "=== Unreal Engine Information ==="
+          # Use direct path instead of environment variable
-          ls -la "$UE_ROOT/Build/BatchFiles"
+          UE_ENGINE_PATH="/Users/Shared/Epic Games/UE_5.5/Engine"
           
-          echo "=== Project Information ==="
+          # Find project file (using direct find instead of recursive search for speed)
-          # Detailed search for the project file
+          UPROJECT_PATH=$(find . -maxdepth 1 -name "*.uproject" -type f | head -1)
-          echo "Searching for .uproject files:"
-          find . -name "*.uproject" -type f
-          
-          # Get the absolute path of the project file
-          UPROJECT_PATH=$(find . -name "*.uproject" -type f | head -1)
           if [ -z "$UPROJECT_PATH" ]; then
-            echo "Error: Could not find .uproject file"
+            echo "Error: Could not find .uproject file in root directory"
             exit 1
           fi
           
-          # Convert to absolute path and verify file exists
+          # Convert to absolute path (handle potential realpath availability issues)
-          UPROJECT_ABSOLUTE_PATH=$(realpath "$UPROJECT_PATH")
+          if command -v realpath &> /dev/null; then
+            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"
           
-          if [ ! -f "$UPROJECT_ABSOLUTE_PATH" ]; then
-            echo "Error: Project file does not exist at: $UPROJECT_ABSOLUTE_PATH"
-            exit 1
-          fi
-          
-          echo "Using Unreal Engine at: $UE_ROOT"
-          
           # Make the project file readable and executable
           chmod 755 "$UPROJECT_ABSOLUTE_PATH"
           
-          # Run the build using absolute paths
+          # Ensure RunUAT.sh is executable
-          chmod +x "$UE_ROOT/Build/BatchFiles/RunUAT.sh"
+          chmod +x "${UE_ENGINE_PATH}/Build/BatchFiles/RunUAT.sh"
-          "$UE_ROOT/Build/BatchFiles/RunUAT.sh" BuildCookRun \
+          
+          # Set up runtime environment for the build
+          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" \
+            -SkipCookingEditorContent \
+            -iterativecooking \
+            -fastcook \
+            -compressed \
+            -allmaps
       
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3

README.md

@@ -1,3 +1,20 @@
 # luckyworld
 
 this is our unreal repository with our complete source code...
+
+steps to pull the source code down and compile
+
+* (Don't download the .zip file. It's best to use the CLI or a visual tool so LFS can install the proper libraries)
+* git clone https://luckyrobots.com/luckyrobots/luckyworld.git
+* cd luckyworld
+* install git lfs
+    * brew install git-lfs (macOS)
+    * sudo yum install git-lfs (linux)
+    * choco install git (windows) or via https://git-scm.com/download/win 
+        * select option to install git-lfs
+* git lfs pull (just in case)
+* right click .uproject file.
+* Generate Visual Studio Project Files (windows)
+    * Open the generated .sln file with your IDE (i.e. Visual Studio or Rider)
+* (The project starts in 5.5 binary version so if you're using source you will need to right click the .uproject and switch your engine version)
+* Debug 'luckyrobots'