From 6ff5ab9f39156e7a662b5d3607e3f3b7882b7c05 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 4 Aug 2023 13:31:21 -0700
Subject: [PATCH] avoid platform-specific steps by using same shell

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 40f497b78..61eb70aad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,22 +68,16 @@ jobs:
           #   gcc: 12
           #   plugins: "all"
     steps:
-    - name: Set env (windows)
-      if: matrix.os == 'windows'
-      run: echo "DF_FOLDER=DF" >> $env:GITHUB_ENV
-    - name: Set env (posix)
-      if: matrix.os != 'windows'
+    - name: Set env
+      shell: bash
       run: echo "DF_FOLDER=DF" >> $GITHUB_ENV
     - name: Clone DFHack
       uses: actions/checkout@v3
       with:
         repository: 'DFHack/dfhack'
         ref: ${{ inputs.dfhack_ref }}
-    - name: Detect DF version (windows)
-      if: matrix.os == 'windows'
-      run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $env:GITHUB_ENV
-    - name: Detect DF version (posix)
-      if: matrix.os != 'windows'
+    - name: Detect DF version
+      shell: bash
       run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $GITHUB_ENV
     - name: Fetch DF cache
       id: restore-df