Undo other chages besides using the bootstrap script

EliahKagan · EliahKagan · commit 7fd5f15a02df · 2025-02-21T06:00:01.000-05:00
Some of the other changes undertaken to investigate #2004 may be of value, but they don't seem to be needed to get it working, so let's put them off to be evaluated later.
diff --git a/.github/workflows/cygwin-test.yml b/.github/workflows/cygwin-test.yml
@@ -15,7 +15,7 @@ jobs:
 
     defaults:
       run:
-        shell: C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}"
+        shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr "{0}"
 
     steps:
     - name: Force LF line endings
@@ -27,11 +27,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install Cygwin
-      uses: cygwin/cygwin-install-action@v5
+    - name: Set up Cygwin
+      uses: egor-tensin/setup-cygwin@v4
       with:
         packages: python39 python39-pip python39-virtualenv git wget
-        add-to-path: false  # No need to change $PATH outside the Cygwin environment.
 
     - name: Arrange for verbose output
       run: |
@@ -58,7 +57,7 @@ jobs:
 
     - name: Set up virtualenv
       run: |
-        python3.9 -m venv --without-pip .venv
+        python -m venv --without-pip .venv
         echo 'BASH_ENV=.venv/bin/activate' >>"$GITHUB_ENV"
 
     - name: Bootstrap pip in virtualenv
