From 5a4bb1620103a62cfaaff6ef0ea41b787744d34e Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Sun, 21 Apr 2024 21:11:46 -1000
Subject: [PATCH] ci fixes 2

---
 .github/workflows/cd.yml | 22 +++++++++++-----------
 .github/workflows/ci.yml |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 3d210577..9e91f6e7 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -15,7 +15,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-gui-debug-build
     - name: Upload the build
@@ -32,7 +32,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-server-debug-build
     - name: Upload the build
@@ -49,7 +49,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-linux-arm64-gui-debug-build
     - name: Upload the build
@@ -66,7 +66,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-linux-arm64-server-debug-build
     - name: Upload the build
@@ -83,7 +83,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-mac-x86-64-gui-debug-build
     - name: Upload the build
@@ -100,7 +100,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-mac-x86-64-server-debug-build
     - name: Upload the build
@@ -117,7 +117,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-mac-arm64-gui-debug-build
     - name: Upload the build
@@ -134,7 +134,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-mac-arm64-server-debug-build
     - name: Upload the build
@@ -151,7 +151,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-windows-x86-gui-debug-build
     - name: Upload the build
@@ -168,7 +168,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make prefab-windows-x86-server-debug-build
     - name: Upload the build
@@ -185,7 +185,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install pip requirements
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Make the build
       run: make docs-sphinx
     - name: Upload the build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2ec54ac..0d976b1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install dependencies
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Run checks
       run: BA_PCOMMANDBATCH_BUILD_REQUIRE=1 make check
 
@@ -36,7 +36,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install dependencies
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Assemble monolithic server build
       run: make cmake-server-build
     - name: Run tests
@@ -54,7 +54,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install dependencies
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Build spinoff project with only core featureset
       run: make spinoff-test-core
     - name: Build spinoff project with core and base featuresets
@@ -72,7 +72,7 @@ jobs:
       with:
         python-version: '3.12'
     - name: Install dependencies
-      run: tools/pcommand install_pip_reqs
+      run: make prereqs
     - name: Create poo feature-set
       run: tools/spinoff fset-copy template_fs poo
     - name: Add new feature-set to project