Merge branch 'main' into patch-18

Author: sarahsturgeon

.github/workflows/check_for_updates.yml

@@ -20,15 +20,17 @@ jobs:
       latest_sixtyfour: ${{ steps.latest_versions.outputs.sixtyfour }}
       latest_dev: ${{ steps.latest_versions.outputs.dev }}
       latest_prerelease: ${{ steps.latest_versions.outputs.prerelease }}
+      latest_network_test: ${{ steps.latest_versions.outputs.network_test }}
       needs_update_public: ${{ steps.needs_update.outputs.public }}
       needs_update_sixtyfour: ${{ steps.needs_update.outputs.sixtyfour }}
       needs_update_dev: ${{ steps.needs_update.outputs.dev }}
       needs_update_prerelease: ${{ steps.needs_update.outputs.prerelease }}
+      needs_update_network_test: ${{ steps.needs_update.outputs.network_test }}
 
       any_update_needed: ${{ steps.needs_update.outputs.any }}
     steps:
       - name: Checkout Full Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           path: full_repo
@@ -73,13 +75,15 @@ jobs:
           sixtyfour=$(grep -A 2 '"x86-64"' "$struct" | grep '"buildid"' | awk '{print $2}' | sed 's/"//g')
           dev=$(grep -A 2 '"dev"' "$struct" | grep '"buildid"' | awk '{print $2}' | sed 's/"//g')
           prerelease=$(grep -A 2 '"prerelease"' "$struct" | grep '"buildid"' | awk '{print $2}' | sed 's/"//g')
+          network_test=$(grep -A 2 '"network_test"' "$struct" | grep '"buildid"' | awk '{print $2}' | sed 's/"//g')
 
           echo "Latest Public ID: '$public'"
           echo "Latest 64bit ID: '$sixtyfour'"
           echo "Latest Dev ID: '$dev'"
           echo "Latest prerelease ID: '$prerelease'"
+          echo "Latest network_test ID: '$network_test'"
 
-          if [ -z "$public" ] || [ -z "$sixtyfour" ] || [ -z "$dev" ] || [ -z "$prerelease" ]; then
+          if [ -z "$public" ] || [ -z "$sixtyfour" ] || [ -z "$dev" ] || [ -z "$prerelease" ] || [ -z "$network_test" ]; then
             echo "Failed to get one or more latest build IDs"
             echo "Raw Output from SteamCMD:"
             cat "$GITHUB_WORKSPACE/raw_output.txt"
@@ -91,9 +95,10 @@ jobs:
           echo "sixtyfour=$sixtyfour" >> $GITHUB_OUTPUT
           echo "dev=$dev" >> $GITHUB_OUTPUT
           echo "prerelease=$prerelease" >> $GITHUB_OUTPUT
+          echo "network_test=$network_test" >> $GITHUB_OUTPUT
 
       - name: Checkout last build branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: build/last-build-versions
           path: build_versions
@@ -105,16 +110,19 @@ jobs:
           sixtyfour=$(cat $GITHUB_WORKSPACE/build_versions/last_64bit_build.txt 2>/dev/null || echo "0")
           dev=$(cat $GITHUB_WORKSPACE/build_versions/last_dev_build.txt 2>/dev/null || echo "0")
           prerelease=$(cat $GITHUB_WORKSPACE/build_versions/last_prerelease_build.txt 2>/dev/null || echo "0")
+          network_test=$(cat $GITHUB_WORKSPACE/build_versions/last_network_test_build.txt 2>/dev/null || echo "0")
 
           echo "Last Public ID built: '$public'"
           echo "Last 64bit ID built: '$sixtyfour'"
           echo "Last Dev ID built: '$dev'"
           echo "Last prerelease ID built: '$prerelease'"
+          echo "Last network_test ID built: '$network_test'"
 
           echo "public=$public" >> $GITHUB_OUTPUT
           echo "sixtyfour=$sixtyfour" >> $GITHUB_OUTPUT
           echo "dev=$dev" >> $GITHUB_OUTPUT
           echo "prerelease=$prerelease" >> $GITHUB_OUTPUT
+          echo "network_test=$network_test" >> $GITHUB_OUTPUT
 
       - name: Identify pending updates
         id: needs_update
@@ -124,6 +132,7 @@ jobs:
           needs_sixtyfour=$([[ "${{ steps.latest_versions.outputs.sixtyfour }}" != "${{ steps.last_versions.outputs.sixtyfour }}" ]] && echo "true" || echo "false")
           needs_dev=$([[ "${{ steps.latest_versions.outputs.dev }}" != "${{ steps.last_versions.outputs.dev }}" ]] && echo "true" || echo "false")
           needs_prerelease=$([[ "${{ steps.latest_versions.outputs.prerelease }}" != "${{ steps.last_versions.outputs.prerelease }}" ]] && echo "true" || echo "false")
+          needs_network_test=$([[ "${{ steps.latest_versions.outputs.network_test }}" != "${{ steps.last_versions.outputs.network_test }}" ]] && echo "true" || echo "false")
 
           # If this was a manual run with the "force_rebuild" option, update them all regardless of if they're outdated
           if [[ "${{ github.event_name }}" == "workflow_dispatch" && "${{ github.event.inputs.force_rebuild }}" == "true" ]]; then
@@ -132,21 +141,24 @@ jobs:
             needs_sixtyfour="true"
             needs_dev="true"
             needs_prerelease="true"
+            needs_network_test="true"
           fi
 
           echo "Should build Public: '$needs_public'"
           echo "Should build 64bit: '$needs_sixtyfour'"
           echo "Should build Dev: '$needs_dev'"
           echo "Should build Prerelease: '$needs_prerelease'"
+          echo "Should build Network_test: '$needs_network_test'"
 
           echo "public=$needs_public" >> $GITHUB_OUTPUT
           echo "sixtyfour=$needs_sixtyfour" >> $GITHUB_OUTPUT
           echo "dev=$needs_dev" >> $GITHUB_OUTPUT
           echo "prerelease=$needs_prerelease" >> $GITHUB_OUTPUT
+          echo "network_test=$needs_network_test" >> $GITHUB_OUTPUT
 
           # Determine if any update is needed for the final commit step
           any_update="false"
-          if [[ "$needs_public" == "true" || "$needs_sixtyfour" == "true" || "$needs_dev" == "true" || "$needs_prerelease" == "true" ]]; then
+          if [[ "$needs_public" == "true" || "$needs_sixtyfour" == "true" || "$needs_dev" == "true" || "$needs_prerelease" == "true" || "$needs_network_test" == "true" ]]; then
             any_update="true"
           fi
           echo "Any update needed: $any_update"
@@ -159,7 +171,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [public, x86-64, dev, prerelease]
+        branch: [public, x86-64, dev, prerelease, network_test]
         include:
           - branch: public
             needs_update_flag: ${{ needs.check_updates.outputs.needs_update_public }}
@@ -173,10 +185,13 @@ jobs:
           - branch: prerelease
             needs_update_flag: ${{ needs.check_updates.outputs.needs_update_prerelease }}
             game_version: ${{ needs.check_updates.outputs.latest_prerelease }}
+          - branch: network_test
+            needs_update_flag: ${{ needs.check_updates.outputs.needs_update_network_test }}
+            game_version: ${{ needs.check_updates.outputs.latest_network_test }}
 
     steps:
       - name: Checkout Full Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: full_repo
 
@@ -198,7 +213,7 @@ jobs:
 
     steps:
       - name: Checkout last build branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: build/last-build-versions
           path: build_versions
@@ -212,6 +227,7 @@ jobs:
           echo "${{ needs.check_updates.outputs.latest_sixtyfour }}" > ./last_64bit_build.txt
           echo "${{ needs.check_updates.outputs.latest_dev }}" > ./last_dev_build.txt
           echo "${{ needs.check_updates.outputs.latest_prerelease }}" > ./last_prerelease_build.txt
+          echo "${{ needs.check_updates.outputs.latest_network_test }}" > ./last_network_test_build.txt
 
           git config user.name "github-actions"
           git config user.email "github-actions@github.com"

.github/workflows/run_tests.yml

@@ -117,7 +117,7 @@ jobs:
     steps:
       - name: "Check out the repo"
         if: ${{ inputs.no-checkout != 'true' }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: project
 
@@ -192,7 +192,7 @@ jobs:
 
       - name: Download artifact (Github)
         if: inputs.download-artifact != '' && !(startsWith(inputs.download-artifact, 'https://') || startsWith(inputs.download-artifact, 'http://'))
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: ${{ github.workspace }}/gluatest/docker/_gluatest_artifacts/
           name: "${{ inputs.download-artifact }}"
@@ -284,7 +284,7 @@ jobs:
 
       - name: Upload Test Log Artifact
         if: always() && inputs.logs-as-artifact == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: gluatest-log-${{ inputs.branch }}
           path: ${{ github.workspace }}/gluatest-log-${{ inputs.branch }}.log

docker/Dockerfile

@@ -12,8 +12,14 @@ ARG home=/home/steam
 ARG gmodroot=$home/gmodserver
 ARG server=$home/gmodserver/garrysmod
 
+# HACK! Fix this once you know how!
+# We have no idea why, but the first steamcmd call updates Steam BUT then randomly fails the install:
+# > ERROR! Failed to install app '4020' (Missing configuration)
+#
+# So as a workaround, we call it a second time, where it then decides to just magically work... pure magic.
 USER steam
 RUN echo "Downloading $GMOD_BRANCH branch"; \
+./steamcmd.sh +force_install_dir $gmodroot +login anonymous +app_update 4020 -beta $GMOD_BRANCH validate +quit; \
 ./steamcmd.sh +force_install_dir $gmodroot +login anonymous +app_update 4020 -beta $GMOD_BRANCH validate +quit;
 
 # Initial server config

lua/gluatest/expectations/expect.lua

@@ -18,7 +18,7 @@ return function( subject, ... )
         wasNot = negative
     }
 
-    hook.Run( "GLuaTest_CreateExpect", expect )
+    hook.Run( "GLuaTest_CreateExpect", subject, expect )
 
     return expect
 end