More experimental changes to ci

.github/workflows/build.yml

@@ -16,18 +16,12 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9.x'
-      - uses: actions/cache@v4
-        id: pip-cache
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-20.04-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-20.04-pip-
+          cache: 'pip'
       - uses: actions/cache@v4
         id: geos-build-cache
         with:
           path: geos/build
-          key: ${{ runner.os }}-20.04-geos-build-${{ hashFiles('bin/build-linux') }}
+          key: ${{ runner.os }}-20.04-geos-build-${{ hashFiles('**/bin/build-linux-dist') }}
           restore-keys: |
             ${{ runner.os }}-20.04-geos-build-
 
@@ -93,11 +87,12 @@ jobs:
         with:
           python-version: '3.8.x'
           architecture: 'x86'
+          cache: 'pip'
       - uses: actions/cache@v4
         id: geos-build-cache
         with:
           path: geos
-          key: win32-geos-build-${{ hashFiles('bin/geos-win.cmd') }}
+          key: win32-geos-build-${{ hashFiles('**/bin/build-geos-win.cmd') }}
           restore-keys: |
             win32-geos-build-
       - uses: microsoft/setup-msbuild@v2
@@ -166,11 +161,12 @@ jobs:
         with:
           python-version: '3.8.x'
           architecture: 'x64'
+          cache: 'pip'
       - uses: actions/cache@v4
         id: geos-build-cache
         with:
           path: geos
-          key: win64-geos-build-${{ hashFiles('bin/geos-win.cmd') }}
+          key: win64-geos-build-${{ hashFiles('**/bin/build-geos-win.cmd') }}
           restore-keys: |
             win64-geos-build-
       - uses: microsoft/setup-msbuild@v2
@@ -232,6 +228,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9.x'
+          cache: 'pip'
       - name: install dependencies
         shell: bash
         run: |
@@ -293,6 +290,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9.x'
+          cache: 'pip'
       - name: install dependencies
         shell: bash
         run: |