Skip to content

Commit

Permalink
Merge pull request #3201 from pygame-community/ankith26-fix-ci
Browse files Browse the repository at this point in the history
Fix latest SDL3 and MSYS2 fails
  • Loading branch information
ankith26 authored Oct 31, 2024
2 parents 1814397 + 44a3370 commit c5781dc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-on-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
matrix:
include:
- { sys: mingw64, env: x86_64 }
- { sys: mingw32, env: i686 }
- { sys: ucrt64, env: ucrt-x86_64 }
- { sys: clang64, env: clang-x86_64 }
# - { sys: clangarm64, env: clang-aarch64 }
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/build-sdl3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,24 @@ jobs:
steps:
- uses: actions/[email protected]

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

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

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

0 comments on commit c5781dc

Please sign in to comment.