pass 17

.github/workflows/build-windows.yml

@@ -55,6 +55,16 @@ jobs:
           }
 
     steps:
+      - name: Test for Win Deps cache hit
+        id: windep-cache
+        uses: actions/[email protected]
+        with:
+          path: ${{ github.workspace }}/pygame_win_deps_${{ matrix.winarch }}
+          # The hash of all files in buildconfig manylinux-build and windependencies is 
+          # the key to the cache. If anything changes here, the deps are built again
+          key: windep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/windependencies/*.sh') }}-${{ matrix.winarch }}
+          lookup-only: true
+
       - run: git config --global core.autocrlf input  # do not introduce carriage returns
       - uses: actions/[email protected]
       - uses: msys2/setup-msys2@v2
@@ -66,16 +76,6 @@ jobs:
             mingw-w64-${{ matrix.winarch }}-autotools
             mingw-w64-${{ matrix.winarch }}-nasm
 
-      - name: Test for Win Deps cache hit
-        id: windep-cache
-        uses: actions/[email protected]
-        with:
-          path: ${{ github.workspace }}/pygame_win_deps_${{ matrix.winarch }}
-          # The hash of all files in buildconfig manylinux-build and windependencies is 
-          # the key to the cache. If anything changes here, the deps are built again
-          key: windep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/windependencies/*.sh') }}-${{ matrix.winarch }}
-          lookup-only: true
-
       # build win deps on cache miss
       - name: Build Win Deps
         if: steps.windep-cache.outputs.cache-hit != 'true'

buildconfig/windependencies/build_win_deps.sh

@@ -5,7 +5,7 @@ set -e -x
 # The below three lines convert something like D:\path\goes\here to /d/path/goes/here
 export BASE_DIR=$(echo "$GITHUB_WORKSPACE" | tr '[:upper:]' '[:lower:]')
 export BASE_DIR="${BASE_DIR//\\//}"  # //\\// replaces all \ with / in the variable
-export BASE_DIR="${BASE_DIR//:/}"  # remove colon from drive part
+export BASE_DIR="/${BASE_DIR//:/}"  # remove colon from drive part, add leading /
 
 export WIN_PREFIX_PATH="$BASE_DIR/pygame_win_deps_$WIN_ARCH"