CI: {cache-deps,test}: fix expressions & org platform step names

Author: Anton-Latukha

.github/workflows/cache-deps.yml

@@ -46,13 +46,13 @@ jobs:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: "3.4"
 
-      - if: matrix.os == 'windows-latest'
-        name: Set some window specific things
+      - if: runner.os == 'Windows'
+        name: (Windows) Platform config
         run: |
           echo "CABAL_PKGS_DIR=~\\AppData\\cabal\\packages" >> $GITHUB_ENV
 
-      - if: (${{ env.RUNNER_OS }} == 'Linux') || (${{ env.RUNNER_OS}} == 'macOS')
-        name: Set some Linux/macOS specific things
+      - if: ( runner.os == 'Linux' ) || ( runner.os == 'macOS' )
+        name: (Linux,macOS) Platform config
         run: |
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
@@ -87,8 +87,8 @@ jobs:
       - run: cabal update
 
       # Work around for filepath length limits in Windows
-      - if: ${{ env.RUNNER_OS }} == 'Windows'
-        name: Shorten binary names
+      - if: runner.os == 'Windows'
+        name: (Windows) Shorten binary names
         run: |
           sed -i.bak -e 's/haskell-language-server/hls/g' \
                      -e 's/haskell_language_server/hls/g' \
@@ -100,6 +100,6 @@ jobs:
         run: cabal v2-build --enable-tests --enable-benchmarks --only-dependencies
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
-      - if: ${{ env.RUNNER_OS }} == 'Windows'
-        name: In Windows run build additional 2 times
+      - if: runner.os == 'Windows'
+        name: (Windows) Run build additional 2 times
         run: cabal v2-build --enable-tests --enable-benchmarks --only-dependencies || cabal v2-build --enable-tests --enable-benchmarks --only-dependencies

.github/workflows/test.yml

@@ -86,14 +86,14 @@ jobs:
       - run: ./fmt.sh
         name: "HLint via ./fmt.sh"
 
-      - if: ${{ env.RUNNER_OS }} == 'Windows'
-        name: Set some window specific things
+      - if: runner.os == 'Windows'
+        name: (Windows) Platform config
         run: |
           echo "CABAL_PKGS_DIR=~\\AppData\\cabal\\packages" >> $GITHUB_ENV
 
 
-      - if: (${{ env.RUNNER_OS }} == 'Linux') || (${{ env.RUNNER_OS}} == 'macOS')
-        name: Set some Linux/macOS specific things
+      - if: ( runner.os == 'Linux' ) || ( runner.os == 'macOS' )
+        name: (Linux,macOS) Platform config
         run: |
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
@@ -127,8 +127,8 @@ jobs:
       - run: cabal update
 
       # Work around for filepath length limits in Windows
-      - if: ${{ env.RUNNER_OS }} == 'Windows'
-        name: Shorten binary names
+      - if: runner.os == 'Windows'
+        name: (Windows) Shorten binary names
         run: |
           sed -i.bak -e 's/haskell-language-server/hls/g' \
                      -e 's/haskell_language_server/hls/g' \
@@ -140,8 +140,8 @@ jobs:
         run: cabal v2-build
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
-      - if: ${{ env.RUNNER_OS }} == 'Windows'
-        name: In Windows run build additional 2 times
+      - if: runner.os == 'Windows'
+        name: (Windows) Run build additional 2 times
         run: cabal v2-build || cabal v2-build
 
       - name: Set test options