From ce7489884fa7951793d0d10118520017eaae214a Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Mon, 2 May 2022 17:54:49 -0400
Subject: [PATCH] CI: Update Cygwin pip, but not on 32-bit

* CI: Update Cygwin pip, but not on 32-bit

32-bit Cygwin pip>=22 fails to install coverage.

* CI: Let .ci/install.sh handle updating pip

* CI Combine pip update conditions

* CI: Don't try to upgrade pip on 32-bit Cygwin
---
 .ci/install.sh                    | 3 +++
 .github/workflows/test-cygwin.yml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 856cbe5f9..02e1474bd 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -23,6 +23,9 @@ if [[ $(uname) != CYGWIN* ]]; then
     sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\
                              ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\
                              cmake meson imagemagick libharfbuzz-dev libfribidi-dev
+fi
+
+if [[ $(uname -mo) != "i*86 Cygwin" ]]; then
     python3 -m pip install --upgrade pip
 fi
 
diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index aec937aa7..0c175a6d4 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -60,7 +60,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          dash.exe -c "python3.${{ matrix.python-minor-version }} -m pip install -U pip"
           bash.exe .ci/install.sh
 
       - name: Install a different NumPy