diff --git a/.gitea/workflows/godot-ci.yml b/.gitea/workflows/godot-ci.yml index 0d009c4..769372a 100644 --- a/.gitea/workflows/godot-ci.yml +++ b/.gitea/workflows/godot-ci.yml @@ -89,6 +89,8 @@ jobs: container: image: cm2network/steamcmd:root needs: [export-windows, export-linux] + env: + STEAM_HOME: /root/steamcmd_data steps: # Need to install nodejs and git, and initalize git lfs for checkout - name: Install node.js and git @@ -129,15 +131,14 @@ jobs: - name: Read Cache run: | - mkdir -p ./steam_cache - mkdir -p /root/Steam/config - cp ./steam_cache/config.vdf /root/Steam/config/ 2>/dev/null || echo "No cached config file" - cp ./steam_cache/ssfn* /root/Steam/ 2>/dev/null || echo "No cached sentry file" + mkdir -p ${{ env.STEAM_HOME }}/config + cp ./steam_cache/config.vdf ${{ env.STEAM_HOME }}/config/ 2>/dev/null || echo "No cached config file" + cp ./steam_cache/ssfn* ${{ env.STEAM_HOME }}/ 2>/dev/null || echo "No cached sentry file" echo "Files in cache:" ls -la ./steam_cache/ 2>/dev/null || echo "No cache directory" echo "Files in Steam directory:" - ls -la /root/Steam/ 2>/dev/null || echo "No Steam directory" + ls -la ${{ env.STEAM_HOME }}/ 2>/dev/null || echo "No Steam directory" - name: Update VDF run: | @@ -149,26 +150,23 @@ jobs: run: | cd $PROJECT_PATH # Try without Steam Guard first (for cached auth) - /home/steam/steamcmd/steamcmd.sh +login "${{ vars.STEAM_BUILD_USERNAME }}" "${{ secrets.STEAM_BUILD_PASSWORD }}" +run_app_build "$PWD/build/build_dependencies/steam/app_build_2739610.vdf" +quit || { + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +login "${{ vars.STEAM_BUILD_USERNAME }}" "${{ secrets.STEAM_BUILD_PASSWORD }}" +run_app_build "$PWD/build/build_dependencies/steam/app_build_2739610.vdf" +quit || { echo "Login failed, trying with Steam Guard" # If that fails, use Steam Guard in single session - /home/steam/steamcmd/steamcmd.sh +set_steam_guard_code "${{ secrets.STEAM_GUARD_CODE }}" +login "${{ vars.STEAM_BUILD_USERNAME }}" "${{ secrets.STEAM_BUILD_PASSWORD }}" +run_app_build "$PWD/build/build_dependencies/steam/app_build_2739610.vdf" +quit + /home/steam/steamcmd/steamcmd.sh +@sSteamCmdForcePlatformType linux +set_steam_guard_code "${{ secrets.STEAM_GUARD_CODE }}" +login "${{ vars.STEAM_BUILD_USERNAME }}" "${{ secrets.STEAM_BUILD_PASSWORD }}" +run_app_build "$PWD/build/build_dependencies/steam/app_build_2739610.vdf" +quit } - name: Write Cache run: | mkdir -p ./steam_cache - # Debug: Show all files in Steam directory - echo "All files in /root/Steam:" - find /root/Steam -type f -name "*" 2>/dev/null | head -20 + # Debug: Show all files in the steam home directory + echo "All files in ${{ env.STEAM_HOME }}:" + find ${{ env.STEAM_HOME }} -type f -name "*" 2>/dev/null - # Copy config file - cp /root/Steam/config/config.vdf ./steam_cache/ 2>/dev/null || echo "No config file to cache" - - # Look for sentry files in various locations - cp /root/Steam/ssfn* ./steam_cache/ 2>/dev/null || echo "No sentry files in /root/Steam/" - cp /root/Steam/config/ssfn* ./steam_cache/ 2>/dev/null || echo "No sentry files in /root/Steam/config/" + # Copy config file and sentry file to cache + cp ${{ env.STEAM_HOME }}/config/config.vdf ./steam_cache/ 2>/dev/null || echo "No config file to cache" + cp ${{ env.STEAM_HOME }}/ssfn* ./steam_cache/ 2>/dev/null || echo "No sentry file to cache" echo "Files cached:" ls -la ./steam_cache/ 2>/dev/null || echo "No cache directory" \ No newline at end of file