Updated to GodotSteam Server 3.1

GodotSteam · Feb 7, 2024 · 4ddf7af · 4ddf7af
1 parent a1db740
commit 4ddf7af
Show file tree

Hide file tree

Showing 9 changed files with 460 additions and 193 deletions.
diff --git a/.github/workflows/build-linux-artifact.yml b/.github/workflows/build-linux-artifact.yml
@@ -35,15 +35,15 @@ jobs:
     steps:
       # Checkout Godot
       - name: Checkout Godot
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "godotengine/godot"
           path: "godot"
           ref: ${{ inputs.godot_tag }}
 
       # Checkout current source of GodotSteam Server
       - name: Checkout GodotSteam Server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "godotsteam_server"
       - name: Copy GodotSteam Server Module
@@ -52,7 +52,7 @@ jobs:
 
       # Checkout Steamworks SDK
       - name: Checkout Steamworks SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "steamworks"
           repository: ${{ secrets.steamworks_sdk_repo }}
@@ -79,7 +79,7 @@ jobs:
           ./relocate-sdk.sh
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
 
       - name: Set up SCons
         shell: bash
@@ -90,7 +90,7 @@ jobs:
       
       - name: Load .scons_cache directory
         id: godot-extension-cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{github.workspace}}/.scons_cache/
           key: ${{github.job}}-${{env.base_branch}}-${{github.ref}}-${{github.sha}}
@@ -109,14 +109,16 @@ jobs:
           PATH=/opt/x86_64-godot-linux-gnu_sdk-buildroot/bin:$PATH scons ${{ inputs.build_params }}
           mv bin/${{ inputs.binary_name }} bin/${{ inputs.export_name }}
       - name: Upload Linux Build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact_name }}
           path: godot/bin/${{ inputs.export_name }}
+          overwrite: true
           retention-days: 1
       - name: Upload Linux Steam File
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-libsteam-api-so
           path: godot/modules/godotsteam_server/sdk/redistributable_bin/linux64/libsteam_api.so
+          overwrite: true
           retention-days: 1
diff --git a/.github/workflows/build-macos-artifact.yml b/.github/workflows/build-macos-artifact.yml
@@ -30,15 +30,15 @@ jobs:
     steps:
       # Checkout Godot
       - name: Checkout Godot
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "godotengine/godot"
           path: "godot"
           ref: ${{ inputs.godot_tag }}
 
       # Checkout current source of GodotSteam Server
       - name: Checkout GodotSteam Server
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "godotsteam_server"
       - name: Copy GodotSteam Server Module
@@ -47,7 +47,7 @@ jobs:
 
       # Checkout Steamworks SDK
       - name: Checkout Steamworks SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "steamworks"
           repository: ${{ secrets.steamworks_sdk_repo }}
@@ -58,26 +58,6 @@ jobs:
           cp -r steamworks/public godot/modules/godotsteam_server/sdk
           cp -r steamworks/redistributable_bin godot/modules/godotsteam_server/sdk
           ls -la godot/modules/godotsteam_server/sdk
-
-      # Install the Vulkan SDK, script copied from the official Godot build scripts.
-      - name: Install Vulkan SDK
-        run: |
-          set -euo pipefail
-          IFS=$'\n\t'
-          # Download and install the Vulkan SDK.
-          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/vulkan-sdk.dmg
-          hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
-          /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
-              --accept-licenses --default-answer --confirm-command install
-          cnt=5
-          until hdiutil detach -force /Volumes/vulkan-sdk
-          do
-             [[ cnt -eq "0" ]] && break
-             sleep 1
-             ((cnt--))
-          done
-          rm -f /tmp/vulkan-sdk.dmg
-          echo 'Vulkan SDK installed successfully!'
       - name: Install Build Tools
         run: |
           brew install scons yasm
@@ -88,14 +68,14 @@ jobs:
         run: |
           scons ${{ inputs.build_params }}
       - name: Upload MacOS Build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact_name }}
           path: godot/bin/${{ inputs.export_name }}
           if-no-files-found: error
           retention-days: 1
       - name: Upload MacOS Steam Dylib
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macos-libsteam-api-dylib
           path: godot/modules/godotsteam_server/sdk/redistributable_bin/osx/libsteam_api.dylib
@@ -108,16 +88,18 @@ jobs:
           zip -r ./osx_template.zip ./osx_template.app/
           popd
       - name: Upload MacOS Tool App
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macos-tool-app
           path: godot/misc/dist/osx_tools.zip
           if-no-files-found: error
+          overwrite: true
           retention-days: 1
       - name: Upload MacOS Template App
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: macos-template-app
           path: godot/misc/dist/osx_template.zip
           if-no-files-found: error
+          overwrite: true
           retention-days: 1