Skip to content

Commit

Permalink
CI: Update Cygwin pip, but not on 32-bit
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
DWesl committed May 2, 2022
1 parent 143e57b commit ce74898
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ce74898

Please sign in to comment.