diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2983c5179..ff234c4e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,15 +127,15 @@ jobs: - name: Install sdl2 (mingw-w64) if: startsWith(matrix.shell, 'msys2') run: | - curl -L -o mingw-w64-x86_64-SDL2-2.30.4-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.4-1-any.pkg.tar.zst - pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.4-1-any.pkg.tar.zst + curl -L -o mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst + pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst - name: Install sdl2 (msvc) if: startsWith(matrix.shell, 'cmd') run: | - curl -L -o SDL2-devel-2.30.4-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.30.4/SDL2-devel-2.30.4-VC.zip - unzip SDL2-devel-2.30.4-VC.zip - mv "${{ github.workspace }}/SDL2-2.30.4" "${{ github.workspace }}/sdl2" + curl -L -o SDL2-devel-2.30.6-VC.zip https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-VC.zip + unzip SDL2-devel-2.30.6-VC.zip + mv "${{ github.workspace }}/SDL2-2.30.6" "${{ 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 0dd21cc51..7601b2991 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.30.4 + git clone https://github.com/libsdl-org/SDL.git -b release-2.30.6 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.30.4-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.4-1-any.pkg.tar.zst - pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.4-1-any.pkg.tar.zst + curl -L -o mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst + pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst - name: Install Qt uses: jurplel/install-qt-action@v3