-
-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'pygame-community:main' into skew
- Loading branch information
Showing
13 changed files
with
33 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,10 +65,10 @@ jobs: | |
- { arch: armv7, base_image: 'balenalib/raspberrypi3-debian:bookworm' } | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Build sources and run tests | ||
uses: uraimo/run-on-arch-action@v2.7.2 | ||
uses: uraimo/run-on-arch-action@v2.8.1 | ||
id: build | ||
with: | ||
arch: ${{ matrix.base_image && 'none' || matrix.arch }} | ||
|
@@ -136,7 +136,7 @@ jobs: | |
done | ||
- name: Test armv7 wheel on armv6 | ||
uses: uraimo/run-on-arch-action@v2.7.2 | ||
uses: uraimo/run-on-arch-action@v2.8.1 | ||
with: | ||
arch: armv6 | ||
distro: bookworm | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,7 +41,7 @@ jobs: | |
SDKROOT: /opt/python-wasm-sdk | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Regen with latest cython (using system python3) | ||
run: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,11 +47,11 @@ jobs: | |
- { macarch: x86_64, os: macos-13 } | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Test for Mac Deps cache hit | ||
id: macdep-cache | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} | ||
# The hash of all files in buildconfig manylinux-build and macdependencies is | ||
|
@@ -116,17 +116,17 @@ jobs: | |
CIBW_BEFORE_TEST: rm -rf ${{ github.workspace }}/pygame_mac_deps | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: pip cache | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
path: ~/Library/Caches/pip # This cache path is only right on mac | ||
key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }} | ||
|
||
- name: Fetch Mac deps | ||
id: macdep-cache | ||
uses: actions/[email protected].1 | ||
uses: actions/[email protected].2 | ||
with: | ||
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }} | ||
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,7 @@ jobs: | |
CIBW_ARCHS: ${{ matrix.arch }} | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Log in to the Container registry | ||
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,13 +42,12 @@ 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 } | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
- uses: msys2/setup-msys2@v2 | ||
with: | ||
msystem: ${{ matrix.sys }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,16 +52,26 @@ jobs: | |
PG_DEPS_FROM_SYSTEM: 1 | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- 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' | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,7 @@ jobs: | |
PG_DEPS_FROM_SYSTEM: 1 | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Install deps | ||
# install numpy from pip and not apt because the one from pip is newer, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,7 @@ jobs: | |
PG_DEPS_FROM_SYSTEM: 1 | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Install deps | ||
# install numpy from pip and not apt because the one from pip is newer, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,7 +50,7 @@ jobs: | |
CIBW_ARCHS: ${{ matrix.winarch }} | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- uses: TheMrMilchmann/setup-msvc-dev@v3 # this lets us use the developer command prompt on windows | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ jobs: | |
runs-on: ubuntu-24.04 | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Install deps | ||
# https://github.com/actions/runner-images/issues/7192 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ jobs: | |
pre-commit: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
- uses: actions/setup-python@v5 | ||
with: | ||
python-version: 3.x | ||
|
@@ -45,7 +45,7 @@ jobs: | |
PIP_BREAK_SYSTEM_PACKAGES: 1 | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Install deps | ||
run: python3 -m pip install pylint sphinx"<7.2.0" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,7 +38,7 @@ jobs: | |
contents: write | ||
|
||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Download all artifacts | ||
uses: actions/download-artifact@v4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ jobs: | |
# IMPORTANT: this permission is mandatory for trusted publishing | ||
id-token: write | ||
steps: | ||
- uses: actions/[email protected].1 | ||
- uses: actions/[email protected].2 | ||
|
||
- name: Pull all release assets | ||
uses: robinraju/[email protected] | ||
|