From 7880fc7265b9fec92fe6d10196a60d9198e86710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kotiuk?= Date: Sun, 12 Nov 2023 14:44:58 +0100 Subject: [PATCH] chore: Bump SDL version to 2.28.5 --- .github/workflows/main.yml | 10 +++++----- .github/workflows/release.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 825a50f87..c2bf587e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,15 +100,15 @@ jobs: - name: Install sdl2 (mingw-w64) if: startsWith(matrix.shell, 'msys2') run: | - curl -L -o mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst - pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst + curl -L -o mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst + pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst - name: Install sdl2 (msvc) if: startsWith(matrix.shell, 'cmd') run: | - curl -L -o SDL2-devel-2.28.2-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.28.2/SDL2-devel-2.28.2-VC.zip - unzip SDL2-devel-2.28.2-VC.zip - mv "${{ github.workspace }}/SDL2-2.28.2" "${{ github.workspace }}/sdl2" + curl -L -o SDL2-devel-2.28.5-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip + unzip SDL2-devel-2.28.5-VC.zip + mv "${{ github.workspace }}/SDL2-2.28.5" "${{ github.workspace }}/sdl2" mklink /J "${{ github.workspace }}\sdl2\SDL2" "${{ github.workspace }}\sdl2\include" - name: Install MSVC diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3667885e3..c5ea8d623 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: #Replace original library with the newer one - name: Build and install newer SDL2 run: | - git clone https://github.com/libsdl-org/SDL.git -b release-2.28.2 + git clone https://github.com/libsdl-org/SDL.git -b release-2.28.5 cd SDL mkdir build cd build @@ -154,8 +154,8 @@ jobs: # SDL2 version for release locked - name: Install sdl2 run: | - curl -L -o mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst - pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.28.2-1-any.pkg.tar.zst + curl -L -o mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst + pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.28.5-1-any.pkg.tar.zst - name: Install Qt uses: jurplel/install-qt-action@v3