From 081e9383017af32af0c6839a49424965d53cacdf Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 3 Aug 2023 21:04:46 -0700
Subject: [PATCH] test RPC interface

---
 .github/workflows/test.yml | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8b8eaa3f4..0184350b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -87,6 +87,8 @@ jobs:
       id: run-tests
       timeout-minutes: 10
       run: python ci/run-tests.py --keep-status "${{ env.DF_FOLDER }}"
+    - name: Check RPC interface
+      run: python ci/check-rpc.py "${{ env.DF_FOLDER }}/dfhack-rpc.txt"
     - name: Upload test artifacts
       uses: actions/upload-artifact@v3
       if: always()
@@ -94,6 +96,7 @@ jobs:
       with:
         name: test-artifacts-msvc
         path: |
+          ${{ env.DF_FOLDER }}/dfhack-rpc.txt
           ${{ env.DF_FOLDER }}/test*.json
           ${{ env.DF_FOLDER }}/*.log
 
@@ -114,34 +117,4 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: test-gcc-${{ matrix.gcc }}
-    # - name: Fetch DF cache
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: ~/DF
-    #     key: df-${{ hashFiles('ci/download-df.sh') }}
-    # - name: Download DF
-    #   run: |
-    #     sh ci/download-df.sh
-    # - name: Run lua tests
-    #   id: run_tests_lua
-    #   run: |
-    #     export TERM=dumb
-    #     status=0
-    #     script -qe -c "python ci/run-tests.py --headless --keep-status \"$DF_FOLDER\"" || status=$((status + 1))
-    #     python ci/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt" || status=$((status + 2))
-    #     mkdir -p artifacts
-    #     cp "$DF_FOLDER"/test*.json "$DF_FOLDER"/*.log artifacts || status=$((status + 4))
-    #     exit $status
-    # - name: Upload test artifacts
-    #   uses: actions/upload-artifact@v3
-    #   if: (success() || failure()) && steps.run_tests.outcome != 'skipped'
-    #   continue-on-error: true
-    #   with:
-    #     name: test-artifacts-${{ matrix.gcc }}
-    #     path: artifacts
-    # - name: Clean up DF folder
-    #   # prevent DFHack-generated files from ending up in the cache
-    #   # (download-df.sh also removes them, this is just to save cache space)
-    #   if: success() || failure()
-    #   run: |
-    #     rm -rf "$DF_FOLDER"
+    # TODO: share windows test logic once there is a Linux DF build to test