From d2f5073ef43b4ba35381ef77071a4a4d7ca7a3a2 Mon Sep 17 00:00:00 2001
From: Jonathan Moody <103143855+moodyjon@users.noreply.github.com>
Date: Wed, 1 Feb 2023 12:36:36 -0500
Subject: [PATCH] Single "set pip cache dir" task with conditional inside.

---
 .github/workflows/main.yml | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6c999c38f..12d30f94e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,14 +35,11 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.7'
-      - name: set pip cache dir (linux/mac)
-        if: (!startsWith(runner.os, 'windows'))
-        id: pip-cache-nix
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
-      - name: set pip cache dir (windows)
-        if: startsWith(runner.os, 'windows')
-        id: pip-cache-win
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $env:GITHUB_ENV
+      - name: set pip cache dir
+        - if: (!startsWith(runner.os, 'windows'))
+          run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+        - if: startsWith(runner.os, 'windows')
+          run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $env:GITHUB_ENV
       - name: debug pip cache
         run: echo "PIP_CACHE_DIR=${{ env.PIP_CACHE_DIR }}"
       - name: extract pip cache
@@ -158,14 +155,11 @@ jobs:
         uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ runner.os }}
-      - name: set pip cache dir (linux/mac)
-        if: (!startsWith(runner.os, 'windows'))
-        id: pip-cache-nix
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
-      - name: set pip cache dir (windows)
-        if: startsWith(runner.os, 'windows')
-        id: pip-cache-win
-        run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $env:GITHUB_ENV
+      - name: set pip cache dir
+        - if: (!startsWith(runner.os, 'windows'))
+          run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
+        - if: startsWith(runner.os, 'windows')
+          run: echo "PIP_CACHE_DIR=$(pip cache dir)" >> $env:GITHUB_ENV
       - name: debug pip cache
         run: echo "PIP_CACHE_DIR=${{ env.PIP_CACHE_DIR }}"
       - name: extract pip cache