From eee481176dab05a64608079b0373cf2a3259c497 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 7 May 2022 14:52:28 +1000
Subject: [PATCH 1/2] Removed DLL rebase

---
 .github/workflows/test-cygwin.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 42f5f2975..2aa03b88e 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -44,7 +44,7 @@ jobs:
         uses: egor-tensin/cleanup-path@v1
         with:
           dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
-          
+
       - name: pip cache
         uses: actions/cache@v3
         with:
@@ -52,7 +52,7 @@ jobs:
           key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
           restore-keys: |
             ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
-            
+
       - name: Ensure correct Python minor version is used in scripts
         shell: bash.exe -eo pipefail -o igncr "{0}"
         run: |
@@ -87,11 +87,6 @@ jobs:
           CFLAGS="-coverage -Werror=implicit-function-declaration" python3 -m pip install -v --global-option="build_ext" .
           python3 selftest.py
 
-      - name: Rebase dlls
-        shell: bash.exe -eo pipefail -o igncr "{0}"
-        run: |
-          /usr/bin/rebase --database $(find /usr{,/local}/lib/python3.${{ matrix.python-minor-version }}/site-packages src/PIL ${HOME}/.local/lib/ /usr/lib/lapack /usr/bin -name \*.dll -o -name \*.exe)
-
       - name: Test
         run: |
           bash.exe xvfb-run -s '-screen 0 1024x768x24' .ci/test.sh

From a5b20f7a3468248d7ca718cd066ebb9f9bcbdb0e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 7 May 2022 15:29:49 +1000
Subject: [PATCH 2/2] Removed setting alternative

---
 .github/workflows/test-cygwin.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 2aa03b88e..ae1c0fb8b 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -53,14 +53,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
 
-      - name: Ensure correct Python minor version is used in scripts
-        shell: bash.exe -eo pipefail -o igncr "{0}"
-        run: |
-          /usr/sbin/alternatives --set python3 /usr/bin/python3.${{ matrix.python-minor-version }}
-          /usr/sbin/alternatives --display python3
-          /usr/sbin/alternatives --set python /usr/bin/python3.${{ matrix.python-minor-version }}
-          /usr/sbin/alternatives --display python
-
       - name: Build system information
         run: |
           dash.exe -c "python3 .github/workflows/system-info.py"