Use Docker action instead of composite one (#46)

* use docker action instead of composite

this makes it more testable locally and it is easier to transfer the
sentry file from steam, as you can run steamcmd container locally to get
it

* cleanup steam deploy

* use bash strict mode
* print actually useful logs
* exit instead of waiting for manual input of steam guard code

* fix deprecated set-output command

#51

Author: mikz

Dockerfile

@@ -0,0 +1,10 @@
+FROM cm2network/steamcmd
+
+ENV STEAM_CMD="$STEAMCMDDIR/steamcmd.sh"
+
+ADD *.sh $STEAMCMDDIR
+
+USER root
+RUN chown -vfR root:root $STEAMCMDDIR
+
+CMD "$STEAMCMDDIR/steam_deploy.sh"

action.yml

@@ -68,38 +68,27 @@ inputs:
 outputs:
   manifest:
     description: "The path to the generated manifest.vdf"
-    value: ${{ steps.steam-deploy.outputs.manifest }}
 runs:
-  using: "composite"
-  steps:
-    - id: setup-steamcmd
-      uses: CyberAndrii/setup-steamcmd@v1
-    - id: steam-deploy
-      env:
-        STEAM_HOME: ${{ steps.setup-steamcmd.outputs.directory }}
-        STEAM_CMD: ${{ steps.setup-steamcmd.outputs.executable }}
-        steam_username: ${{ inputs.username }}
-        steam_password: ${{ inputs.password }}
-        steam_totp: ${{ inputs.totp }}
-        configVdf: ${{ inputs.configVdf }}
-        ssfnFileName: ${{ inputs.ssfnFileName }}
-        ssfnFileContents: ${{ inputs.ssfnFileContents }}
-        appId: ${{ inputs.appId }}
-        firstDepotIdOverride: ${{ inputs.firstDepotIdOverride }}
-        buildDescription: ${{ inputs.buildDescription }}
-        rootPath: ${{ inputs.rootPath }}
-        depot1Path: ${{ inputs.depot1Path }}
-        depot2Path: ${{ inputs.depot2Path }}
-        depot3Path: ${{ inputs.depot3Path }}
-        depot4Path: ${{ inputs.depot4Path }}
-        depot5Path: ${{ inputs.depot5Path }}
-        depot6Path: ${{ inputs.depot6Path }}
-        depot7Path: ${{ inputs.depot7Path }}
-        depot8Path: ${{ inputs.depot8Path }}
-        depot9Path: ${{ inputs.depot9Path }}
-        releaseBranch: ${{ inputs.releaseBranch }}
-      run: |
-        chmod +x $GITHUB_ACTION_PATH/steam_deploy.sh
-        $GITHUB_ACTION_PATH/steam_deploy.sh
-        echo "manifest=$(pwd)/manifest.vdf" >> $GITHUB_OUTPUT
-      shell: bash
+  using: "docker"
+  image: Dockerfile
+  env:
+    steam_username: ${{ inputs.username }}
+    steam_password: ${{ inputs.password }}
+    steam_totp: ${{ inputs.totp }}
+    configVdf: ${{ inputs.configVdf }}
+    ssfnFileName: ${{ inputs.ssfnFileName }}
+    ssfnFileContents: ${{ inputs.ssfnFileContents }}
+    appId: ${{ inputs.appId }}
+    firstDepotIdOverride: ${{ inputs.firstDepotIdOverride }}
+    buildDescription: ${{ inputs.buildDescription }}
+    rootPath: ${{ inputs.rootPath }}
+    depot1Path: ${{ inputs.depot1Path }}
+    depot2Path: ${{ inputs.depot2Path }}
+    depot3Path: ${{ inputs.depot3Path }}
+    depot4Path: ${{ inputs.depot4Path }}
+    depot5Path: ${{ inputs.depot5Path }}
+    depot6Path: ${{ inputs.depot6Path }}
+    depot7Path: ${{ inputs.depot7Path }}
+    depot8Path: ${{ inputs.depot8Path }}
+    depot9Path: ${{ inputs.depot9Path }}
+    releaseBranch: ${{ inputs.releaseBranch }}

steam_deploy.sh

@@ -1,4 +1,14 @@
-#!/bin/sh
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+steamdir=${STEAM_HOME:-$HOME/Steam}
+# this is relative to the action
+contentroot=$(pwd)/$rootPath
+
+# these are temporary file we create, so in a tmpdir
+mkdir BuildOutput
+manifest_path=$(pwd)/manifest.vdf
 
 echo ""
 echo "#################################"
@@ -54,20 +64,6 @@ echo "#    Generating App Manifest    #"
 echo "#################################"
 echo ""
 
-mkdir -p BuildOutput
-
-steamdir=$STEAM_HOME
-manifest_path=$(pwd)/manifest.vdf
-contentroot=$(pwd)/$rootPath
-if [[ "$OSTYPE" = "darwin"* ]]; then
-  steamdir="$HOME/Library/Application Support/Steam"
-elif [[ "$OSTYPE" = "msys"* ]]; then
-  manifest_path=$(cygpath -w "$manifest_path")
-  contentroot=$(cygpath -w "$contentroot")
-elif [ "$RUNNER_OS" = "Linux" ]; then
-  steamdir="/home/runner/Steam"
-fi
-
 cat << EOF > "manifest.vdf"
 "appbuild"
 {
@@ -98,6 +94,8 @@ else
     exit 1
   fi
 
+  steam_totp="INVALID"
+
   echo ""
   echo "#################################"
   echo "#    Copying SteamGuard Files   #"
@@ -120,13 +118,39 @@ else
   echo ""
 fi
 
+echo ""
+echo "#################################"
+echo "#        Test login             #"
+echo "#################################"
+echo ""
+
+$STEAM_CMD +set_steam_guard_code "$steam_totp" +login "$steam_username" "$steam_password" +quit;
+
+ret=$?
+if [ $ret -eq 0 ]; then
+    echo ""
+    echo "#################################"
+    echo "#        Successful login       #"
+    echo "#################################"
+    echo ""
+else
+      echo ""
+      echo "#################################"
+      echo "#        FAILED login           #"
+      echo "#################################"
+      echo ""
+      echo "Exit code: $ret"
+
+      exit $ret
+fi
+
 echo ""
 echo "#################################"
 echo "#        Uploading build        #"
 echo "#################################"
 echo ""
 
-$STEAM_CMD +login "$steam_username" "$steam_password" "$steam_totp" +run_app_build $manifest_path +quit || (
+$STEAM_CMD +login "$steam_username" "$steam_password"  +quit || (
     echo ""
     echo "#################################"
     echo "#             Errors            #"
@@ -136,11 +160,20 @@ $STEAM_CMD +login "$steam_username" "$steam_password" "$steam_totp" +run_app_bui
     echo ""
     ls -alh
     echo ""
-    ls -alh $rootPath
+    ls -alh "$rootPath" || true
     echo ""
     echo "Listing logs folder:"
     echo ""
     ls -Ralph "$steamdir/logs/"
+
+    for f in "$steamdir"/logs/*; do
+      if [ -e "$f" ]; then
+        echo "######## $f"
+        cat "$f"
+        echo
+      fi
+    done
+
     echo ""
     echo "Displaying error log"
     echo ""
@@ -155,5 +188,14 @@ $STEAM_CMD +login "$steam_username" "$steam_password" "$steam_totp" +run_app_bui
     echo "#################################"
     echo ""
     ls -Ralph BuildOutput
+
+    for f in BuildOutput/*.log; do
+      echo "######## $f"
+      cat "$f"
+      echo
+    done
+
     exit 1
   )
+
+echo "manifest=${manifest_path}" >> $GITHUB_OUTPUT