diff --git a/.gitea/workflows/godot-ci.yml b/.gitea/workflows/godot-ci.yml index 78706b8..a08537f 100644 --- a/.gitea/workflows/godot-ci.yml +++ b/.gitea/workflows/godot-ci.yml @@ -86,18 +86,31 @@ jobs: steam-publish: name: Steam Publish runs-on: ubuntu-22.04 - container: - image: cm2network/steamcmd:root + # The container is no longer needed + # container: + # image: cm2network/steamcmd:root needs: [export-windows, export-linux] steps: - # Need to install nodejs and git, and initalize git lfs for checkout - - name: Install node.js and git + - name: Install Dependencies run: | - apt-get update - apt-get install -y curl - curl -fsSL https://deb.nodesource.com/setup_18.x | bash - - apt-get install -y nodejs git git-lfs + sudo dpkg --add-architecture i386 + sudo apt-get update + sudo apt-get install -y --no-install-recommends \ + lib32gcc-s1 \ + lib32stdc++6 \ + curl \ + nodejs \ + git \ + git-lfs git lfs install + + - name: Setup SteamCMD + run: | + mkdir -p ~/steamcmd + curl -fsSL 'https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz' | tar xvzf - -C ~/steamcmd + # Run once to initialize + ~/steamcmd/steamcmd.sh +quit + - name: Checkout uses: https://gitea.com/actions/checkout@v4 with: @@ -120,7 +133,8 @@ jobs: uses: https://gitea.com/actions/cache@v3 with: path: | - ./steam_cache/ + ~/steamcmd/config/ + ~/steamcmd/ssfn* ./steam_build_output/ key: steam-cache-${{ runner.os }}-${{ github.ref_name }} restore-keys: | @@ -129,15 +143,12 @@ jobs: - name: Read Cache run: | - mkdir -p ./steam_cache - mkdir -p /home/steam/Steam/config - cp ./steam_cache/config.vdf /home/steam/Steam/config/ 2>/dev/null || echo "No cached config file" - cp ./steam_cache/ssfn* /home/steam/Steam/ 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 /home/steam/Steam/ 2>/dev/null || echo "No Steam directory" + # The Read Cache step is now handled by the actions/cache@v3 restore process. + # This step can be removed or left for debugging. + echo "Files in steamcmd directory:" + ls -la ~/steamcmd/ + echo "Files in steamcmd config directory:" + ls -la ~/steamcmd/config/ - name: Update VDF run: | @@ -149,26 +160,16 @@ 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 || { + ~/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 || { 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 + ~/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 } - name: Write Cache run: | - mkdir -p ./steam_cache - - # Debug: Show all files in Steam directory - echo "All files in /home/steam/Steam:" - find /home/steam/Steam -type f -name "*" 2>/dev/null | head -20 - - # Copy config file - cp /home/steam/Steam/config/config.vdf ./steam_cache/ 2>/dev/null || echo "No config file to cache" - - # Look for sentry files in various locations - cp /home/steam/Steam/ssfn* ./steam_cache/ 2>/dev/null || echo "No sentry files in /home/steam/Steam/" - cp /home/steam/Steam/config/ssfn* ./steam_cache/ 2>/dev/null || echo "No sentry files in /home/steam/Steam/config/" - - echo "Files cached:" - ls -la ./steam_cache/ 2>/dev/null || echo "No cache directory" \ No newline at end of file + # The Write Cache step is now handled by the actions/cache@v3 save process. + # This step can be removed or left for debugging. + echo "Files in steamcmd directory to be cached:" + ls -la ~/steamcmd/ + ls -la ~/steamcmd/config/ \ No newline at end of file