From 2067f6040930e5c86bd396c4605c39b5eb5a4893 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Thu, 5 May 2022 15:21:22 -0400
Subject: [PATCH] STY: Commit suggestions from PR review.

---
 .ci/install.sh                    |  5 +----
 .github/workflows/test-cygwin.yml | 12 +++++-------
 docs/installation.rst             |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 7364e4a19..6d6894566 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -25,10 +25,7 @@ if [[ $(uname) != CYGWIN* ]]; then
                              cmake meson imagemagick libharfbuzz-dev libfribidi-dev
 fi
 
-if [[ $(uname -mo) != i*86" Cygwin" ]]; then
-    python3 -m pip install --upgrade pip
-fi
-
+python3 -m pip install --upgrade pip
 python3 -m pip install --upgrade wheel
 python3 -m pip install coverage
 python3 -m pip install defusedxml
diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 103fb10f4..61e745ea5 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -9,11 +9,10 @@ jobs:
       fail-fast: false
       matrix:
         python-minor-version: [7, 8, 9]
-        architecture: ["x86_64"]
 
     timeout-minutes: 40
 
-    name: Python 3.${{ matrix.python-minor-version }} ${{ matrix.architecture }}
+    name: Python 3.${{ matrix.python-minor-version }}
 
     steps:
       - name: Fix line endings
@@ -26,7 +25,7 @@ jobs:
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@v2
         with:
-          platform: ${{ matrix.architecture }}
+          platform: x86_64
           packages: >
             ImageMagick gcc-g++ ghostscript jpeg libfreetype-devel
             libimagequant-devel libjpeg-devel liblapack-devel
@@ -50,9 +49,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: 'C:\cygwin\home\runneradmin\.cache\pip'
-          key: ${{ runner.os }}-cygwin-${{ matrix.architecture }}-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
+          key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
           restore-keys: |
-            ${{ runner.os }}-cygwin-${{ matrix.architecture }}-pip3.${{ matrix.python-minor-version }}-
+            ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
             
       - name: Ensure correct python minor version used in scripts
         shell: bash.exe -eo pipefail -o igncr "{0}"
@@ -71,7 +70,6 @@ jobs:
           bash.exe .ci/install.sh
 
       - name: Install a different NumPy
-        if: matrix.architecture == 'x86_64'
         shell: dash.exe -l "{0}"
         run: |
           python3 -m pip install -U 'numpy!=1.21.*'
@@ -119,7 +117,7 @@ jobs:
         with:
           file: ./coverage.xml
           flags: GHA_Cygwin
-          name: Cygwin Python 3.${{ matrix.python-minor-version }} ${{ matrix.architecture }}
+          name: Cygwin Python 3.${{ matrix.python-minor-version }}
 
   success:
     needs: build
diff --git a/docs/installation.rst b/docs/installation.rst
index 48e5b94c2..8cc03f28e 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -485,7 +485,7 @@ These platforms are built and tested for every change.
 |                                  +----------------------------+---------------------+
 |                                  | 3.9 (MinGW)                | x86, x86-64         |
 |                                  +----------------------------+---------------------+
-|                                  | 3.7, 3.8, 3.9 (Cygwin)     | x86, x86-64         |
+|                                  | 3.7, 3.8, 3.9 (Cygwin)     | x86-64              |
 +----------------------------------+----------------------------+---------------------+