Update GHA;

Renegade-Master · Jan 27, 2024 · 4c7d572 · 4c7d572
1 parent 2b47c2b
commit 4c7d572
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -34,8 +34,8 @@ jobs:
         run: |
           podman volume create zomboid-server-podman
           podman volume create zomboid-config-podman
-          echo "podman-server-dir=$(podman volume inspect zomboid-server-podman | jq -r '.[].Mountpoint' -)" >> $GITHUB_OUTPUT
-          echo "podman-config-dir=$(podman volume inspect zomboid-config-podman | jq -r '.[].Mountpoint' -)" >> $GITHUB_OUTPUT
+          echo "installdir=$(podman volume inspect zomboid-server-podman | jq -r '.[].Mountpoint' -)" >> $GITHUB_OUTPUT
+          echo "configdir=$(podman volume inspect zomboid-config-podman | jq -r '.[].Mountpoint' -)" >> $GITHUB_OUTPUT
 
       #######################
       # Podman Build System #
@@ -61,7 +61,7 @@ jobs:
           # Start a timed shutdown signal
           (sleep 360 && podman exec \
             zomboid-server bash -c \
-              "rcon -a $(cat ${{ steps.variables.outputs.podman-config-dir }}/ip.txt):\${RCON_PORT} -p \${RCON_PASSWORD} quit") &
+              "rcon -a $(cat ${{ steps.variables.outputs.configdir }}/ip.txt):\${RCON_PORT} -p \${RCON_PASSWORD} quit") &
 
           # Run the Podman Image
           podman run \
@@ -96,13 +96,13 @@ jobs:
           echo ''
           tree -aL 10 ./ | tee ./root-fs-tree.txt
           echo ''
-          ls -lAuhFn ${{ steps.variables.outputs.podman-server-dir }} | tee ./dedicated-server-install-listing.txt
+          ls -lAuhFn ${{ steps.variables.outputs.installdir }} | tee ./dedicated-server-install-listing.txt
           echo ''
-          ls -lAuhFn ${{ steps.variables.outputs.podman-config-dir }} | tee ./dedicated-server-config-listing.txt
+          ls -lAuhFn ${{ steps.variables.outputs.configdir }} | tee ./dedicated-server-config-listing.txt
           echo ''
-          tree -aL 10 ${{ steps.variables.outputs.podman-server-dir }} | tee ./dedicated-server-install-tree.txt
+          tree -aL 10 ${{ steps.variables.outputs.installdir }} | tee ./dedicated-server-install-tree.txt
           echo ''
-          tree -aL 10 ${{ steps.variables.outputs.podman-config-dir }} | tee ./dedicated-server-config-tree.txt
+          tree -aL 10 ${{ steps.variables.outputs.configdir }} | tee ./dedicated-server-config-tree.txt
 
       - name: Upload Docker Logs
         if: ${{ always() }}
@@ -119,8 +119,8 @@ jobs:
           name: server-configs-${{ matrix.system }}
           path: |
             podman-compose.yaml
-            ${{ steps.variables.outputs.podman-config-dir }}/Server/GitHubActionTest.ini
-            ${{ steps.variables.outputs.podman-config-dir }}/Server/GitHubActionTest_SandboxVars.lua
+            ${{ steps.variables.outputs.configdir }}/Server/GitHubActionTest.ini
+            ${{ steps.variables.outputs.configdir }}/Server/GitHubActionTest_SandboxVars.lua
             ZomboidDedicatedServer/ProjectZomboid64.json
             dedicated-server-install-listing.txt
             dedicated-server-config-listing.txt