From b567c0a5c98f68639d8313504103010cf472e815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 6 Oct 2024 11:47:15 +0200 Subject: [PATCH] package/ci: download a SDL version with CMake configs on AppVeyor. A regression was introduced in 2a8e550b57bbd0fb16d6c143c50057f965ad16ba that affects only Windows builds. The version downloaded on the Windows CI unfortunately doesn't contain CMake configs, so this went unnoticed. --- package/ci/appveyor.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index 4d94066b9..f3c2533c0 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -142,11 +142,12 @@ install: - IF "%TARGET%" == "desktop" set BUILD_APPLICATIONS=YES - IF "%TARGET%" == "desktop-gles" set BUILD_APPLICATIONS=NO -# SDL2 -- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER:~0,4%" == "msvc" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-2.0.9-VC.zip appveyor DownloadFile http://www.libsdl.org/release/SDL2-devel-2.0.9-VC.zip -- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER:~0,4%" == "msvc" 7z x SDL2-devel-2.0.9-VC.zip && ren SDL2-2.0.9 SDL -- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER%" == "mingw" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-2.0.9-mingw.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-2.0.9-mingw.tar.gz -- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER%" == "mingw" 7z x SDL2-devel-2.0.9-mingw.tar.gz & 7z x SDL2-devel-2.0.9-mingw.tar & ren SDL2-2.0.9 SDL +# SDL2. 2.24 is the oldest version that has CMake configs bundled in order to +# verify that FindSDL2 does the correct thing. +- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER:~0,4%" == "msvc" appveyor DownloadFile https://github.com/libsdl-org/SDL/releases/download/release-2.24.0/SDL2-devel-2.24.0-VC.zip +- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER:~0,4%" == "msvc" 7z x SDL2-devel-2.24.0-VC.zip && ren SDL2-2.24.0 SDL +- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER%" == "mingw" appveyor DownloadFile https://github.com/libsdl-org/SDL/releases/download/release-2.24.0/SDL2-devel-2.24.0-mingw.zip +- IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER%" == "mingw" 7z x SDL2-devel-2.24.0-mingw.zip && ren SDL2-2.24.0 SDL # GLFW - IF "%BUILD_APPLICATIONS%" == "YES" IF "%PLATFORM%" == "" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\glfw-3.2.1.bin.WIN32.zip appveyor DownloadFile https://github.com/glfw/glfw/releases/download/3.2.1/glfw-3.2.1.bin.WIN32.zip @@ -177,7 +178,5 @@ build_script: cache: - ninja-win.zip -> package/ci/appveyor-cache-reset.txt -- SDL2-devel-2.0.9-VC.zip -> package/ci/appveyor-cache-reset.txt -- SDL2-devel-2.0.9-mingw.zip -> package/ci/appveyor-cache-reset.txt - openal-soft-1.19.1-bin.zip -> package/ci/appveyor-cache-reset.txt - glfw-3.2.1.bin.WIN64.zip -> package/ci/appveyor-cache-reset.txt