GA: Fix Windows job

tuorqai · Mar 29, 2024 · 158eff7 · 158eff7
1 parent 3b8d72e
commit 158eff7
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -27,28 +27,20 @@ jobs:
 
     env:
       SDL_VERSION: 2.28.5
+      SDL_IMAGE_VERSION: 2.8.2
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Cache SDL
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-sdl
-      with:
-        path: C:\SDL
-        key: win32-build-${{ env.cache-name }}
-
     - name: Download SDL
       run: |
-        if (-Not (Test-Path C:\SDL))
-        {
-            Invoke-WebRequest "https://github.com/libsdl-org/SDL/releases/download/release-$env:SDL_VERSION/SDL2-devel-$env:SDL_VERSION-VC.zip" -o C:\SDL.zip
-            Expand-Archive C:\SDL.zip -DestinationPath C:\
-        }
+        Invoke-WebRequest "https://github.com/libsdl-org/SDL/releases/download/release-$env:SDL_VERSION/SDL2-devel-$env:SDL_VERSION-VC.zip" -OutFile C:\SDL.zip
+        Invoke-WebRequest "https://github.com/libsdl-org/SDL_image/releases/download/release-$env:SDL_IMAGE_VERSION/SDL2_image-devel-$env:SDL_IMAGE_VERSION-VC.zip" -OutFile C:\SDL_image.zip
+        Expand-Archive C:\SDL.zip -DestinationPath C:\
+        Expand-Archive C:\SDL_image.zip -DestinationPath C:\
 
     - name: Configure
-      run: cmake -A Win32 -B build -DCMAKE_PREFIX_PATH="C:/SDL2-$env:SDL_VERSION/cmake"
+      run: cmake -A Win32 -B build -DCMAKE_PREFIX_PATH="C:/SDL2-$env:SDL_VERSION/cmake;C:/SDL2_image-$env:SDL_IMAGE_VERSION/cmake"
 
     - name: Build
       run: cmake --build build --config Release