Skip to content

Commit c5781dc

Browse files
authored
Merge pull request #3201 from pygame-community/ankith26-fix-ci
Fix latest SDL3 and MSYS2 fails
2 parents 1814397 + 44a3370 commit c5781dc

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/build-on-msys2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
matrix:
4343
include:
4444
- { sys: mingw64, env: x86_64 }
45-
- { sys: mingw32, env: i686 }
4645
- { sys: ucrt64, env: ucrt-x86_64 }
4746
- { sys: clang64, env: clang-x86_64 }
4847
# - { sys: clangarm64, env: clang-aarch64 }

.github/workflows/build-sdl3.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,24 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v4.2.1
5656

57-
- name: Install deps (linux)
57+
- name: Install pygame deps (linux)
5858
if: matrix.os == 'ubuntu-24.04'
5959
run: sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev
6060

61-
- name: Install deps (mac)
61+
- name: Install pygame deps (mac)
6262
if: matrix.os == 'macos-14'
6363
run: brew install freetype portmidi
6464

65+
# taken from dependencies of the 'libsdl2-dev' package
66+
- name: Install SDL deps (linux)
67+
if: matrix.os == 'ubuntu-24.04'
68+
run: >
69+
sudo apt-get install libasound2-dev libdbus-1-dev libdecor-0-dev libdrm-dev
70+
libegl-dev libgbm-dev libgl-dev libgles-dev libibus-1.0-dev libpulse-dev
71+
libsamplerate0-dev libsndio-dev libudev-dev libwayland-dev libx11-dev
72+
libxcursor-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev
73+
libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev
74+
6575
# taken from https://wiki.libsdl.org/SDL3/Installation
6676
- name: Install SDL3
6777
if: matrix.os != 'windows-latest'
@@ -74,7 +84,7 @@ jobs:
7484
cmake --build . --config Release --parallel
7585
sudo cmake --install . --config Release
7686
77-
- name: Make sdist and install it
87+
- name: Build with SDL3
7888
run: >
7989
python3 -m pip install . -v -Csetup-args=-Dsdl_api=3
8090
-Csetup-args=-Dimage=disabled

0 commit comments

Comments
 (0)