From cdcb0718267154c24e64af688d17a49622d6c6cf Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 25 Jan 2022 10:17:17 -0500
Subject: [PATCH] Update build.yml

---
 .github/workflows/build.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27de0d9e..a789cf2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -216,12 +216,14 @@ jobs:
                       --with-ensurepip=upgrade \
                       --enable-optimizations \
                       --with-lto
+
       - name: Windows Get External Python deps
         if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           cd "${env:PYTHON_SOURCE_PATH}"
           PCBuild\get_externals.bat
+
       - name: Windows overwrite external OpenSSL with local
         if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
@@ -240,6 +242,7 @@ jobs:
           cp "$env:OPENSSL_INSTALL_PATH\bin\*" "${env:OPENSSL_EXT_TARGET_PATH}"
           cp "$env:OPENSSL_INSTALL_PATH\include\openssl\*" "${env:OPENSSL_EXT_TARGET_PATH}\include\openssl\"
           cp "$env:OPENSSL_INSTALL_PATH\include\openssl\applink.c" "${env:OPENSSL_EXT_TARGET_PATH}\include\"
+
       - name: Windows Install sphinx-build
         if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
@@ -247,6 +250,7 @@ jobs:
           pip install --upgrade pip
           pip install --upgrade sphinx
           sphinx-build --version
+
       - name: Windows Config/Build Python
         if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
@@ -256,6 +260,7 @@ jobs:
           Copy-Item -Path "${env:GITHUB_WORKSPACE}\openssl.props" -Destination PCBuild\
           echo "Building for ${env:PYBUILDRELEASE_ARCH}..."
           PCBuild\build.bat -m --pgo -c Release -p "${env:PYBUILDRELEASE_ARCH}"
+
       - name: Windows Install Python
         if: matrix.goal == 'build' && matrix.os == 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         shell: powershell
@@ -264,21 +269,25 @@ jobs:
           mkdir "${env:PYTHON_INSTALL_PATH}\lib"
           Copy-Item -Path "PCBuild\${env:PYEXTERNALS_PATH}\*" "${env:PYTHON_INSTALL_PATH}\"
           Copy-Item -Path "${env:PYTHON_SOURCE_PATH}\Lib\*" "${env:PYTHON_INSTALL_PATH}\lib\" -recurse
+
       - name: Mac/Linux Build Python
         if: matrix.goal == 'build' && matrix.os != 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
           cd "${PYTHON_SOURCE_PATH}"
           echo "Running: ${MAKE} ${MAKEOPT}"
           $MAKE $MAKEOPT
+
       - name: Mac/Linux Install Python
         if: matrix.goal == 'build' && matrix.os != 'windows-2022' && steps.cache-python-ssl.outputs.cache-hit != 'true'
         run: |
           cd "${PYTHON_SOURCE_PATH}"
           $MAKE altinstall
           $MAKE bininstall
+
       - name: Run Python
         run: |
           "${PYTHON}" -V
+
       - name: Upgrade pip, wheel, etc
         run: |
           curl -O https://bootstrap.pypa.io/get-pip.py
@@ -308,8 +317,8 @@ jobs:
       - name: Install pip requirements
         run: |
              set +e
-             "${PYTHON}" -m pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U --force-reinstall
-             "${PYTHON}" -m pip install --upgrade -r requirements.txt
+             "${PYTHON}" -m pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $PYTHON -m pip install -U --force-reinstall
+             "${PYTHON}" -m pip install --upgrade -r src/requirements.txt
 
       - name: Build GAM with PyInstaller
         if: matrix.goal != 'test'