Skip to content

Commit 40aa98a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into alphablit_refactor
2 parents 5c7a528 + c36a71a commit 40aa98a

File tree

118 files changed

+7446
-4675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+7446
-4675
lines changed

.github/workflows/build-debian-multiarch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- uses: actions/[email protected]
6969

7070
- name: Build sources and run tests
71-
uses: uraimo/[email protected].0
71+
uses: uraimo/[email protected].1
7272
id: build
7373
with:
7474
arch: ${{ matrix.base_image && 'none' || matrix.arch }}
@@ -134,7 +134,7 @@ jobs:
134134
done
135135
136136
- name: Test armv7 wheel on armv6
137-
uses: uraimo/[email protected].0
137+
uses: uraimo/[email protected].1
138138
with:
139139
arch: armv6
140140
distro: bookworm

.github/workflows/build-macos.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
11
name: macOS
22

33
# Run CI only when a release is created, on changes to main branch, or any PR
4-
# to main. Do not run CI on any other branch. Also, skip any non-source changes
5-
# from running on CI
4+
# to main.
65
on:
76
push:
87
branches: main
9-
paths-ignore:
10-
- 'docs/**'
11-
- 'examples/**'
12-
- '.gitignore'
13-
- '*.rst'
14-
- '*.md'
15-
- '.github/workflows/*.yml'
16-
# re-include current file to not be excluded
17-
- '!.github/workflows/build-macos.yml'
188

199
pull_request:
2010
branches: main
21-
paths-ignore:
22-
- 'docs/**'
23-
- 'examples/**'
24-
- '.gitignore'
25-
- '*.rst'
26-
- '*.md'
27-
- '.github/workflows/*.yml'
28-
# re-include current file to not be excluded
29-
- '!.github/workflows/build-macos.yml'
3011

3112
# the github release drafter can call this workflow
3213
workflow_call:
@@ -132,7 +113,7 @@ jobs:
132113
fail-on-cache-miss: true
133114

134115
- name: Install uv for speed
135-
uses: astral-sh/setup-uv@v5
116+
uses: astral-sh/setup-uv@v6
136117
with:
137118
version: "0.5.26"
138119

.github/workflows/build-manylinux.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
11
name: ManyLinux
22

33
# Run CI only when a release is created, on changes to main branch, or any PR
4-
# to main. Do not run CI on any other branch. Also, skip any non-source changes
5-
# from running on CI
4+
# to main.
65
on:
76
push:
87
branches: main
9-
paths-ignore:
10-
- 'docs/**'
11-
- 'examples/**'
12-
- '.gitignore'
13-
- '*.rst'
14-
- '*.md'
15-
- '.github/workflows/*.yml'
16-
# re-include current file to not be excluded
17-
- '!.github/workflows/build-manylinux.yml'
188

199
pull_request:
2010
branches: main
21-
paths-ignore:
22-
- 'docs/**'
23-
- 'examples/**'
24-
- '.gitignore'
25-
- '*.rst'
26-
- '*.md'
27-
- '.github/workflows/*.yml'
28-
# re-include current file to not be excluded
29-
- '!.github/workflows/build-manylinux.yml'
3011

3112
# the github release drafter can call this workflow
3213
workflow_call:
@@ -75,7 +56,7 @@ jobs:
7556

7657
- name: Build and push Docker image
7758
if: steps.inspect.outcome == 'failure'
78-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
59+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
7960
with:
8061
context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
8162
file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}

.github/workflows/build-ubuntu-coverage.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

.github/workflows/build-ubuntu-sdist.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,13 @@
88
name: Ubuntu sdist
99

1010
# Run CI only when a release is created, on changes to main branch, or any PR
11-
# to main. Do not run CI on any other branch. Also, skip any non-source changes
12-
# from running on CI
11+
# to main.
1312
on:
1413
push:
1514
branches: main
16-
paths-ignore:
17-
- 'docs/**'
18-
- 'examples/**'
19-
- '.gitignore'
20-
- '*.rst'
21-
- '*.md'
22-
- '.github/workflows/*.yml'
23-
# re-include current file to not be excluded
24-
- '!.github/workflows/build-ubuntu-sdist.yml'
2515

2616
pull_request:
2717
branches: main
28-
paths-ignore:
29-
- 'docs/**'
30-
- 'examples/**'
31-
- '.gitignore'
32-
- '*.rst'
33-
- '*.md'
34-
- '.github/workflows/*.yml'
35-
# re-include current file to not be excluded
36-
- '!.github/workflows/build-ubuntu-sdist.yml'
3718

3819
# the github release drafter can call this workflow
3920
workflow_call:

.github/workflows/build-windows.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
11
name: Windows
22

33
# Run CI only when a release is created, on changes to main branch, or any PR
4-
# to main. Do not run CI on any other branch. Also, skip any non-source changes
5-
# from running on CI
4+
# to main.
65
on:
76
push:
87
branches: main
9-
paths-ignore:
10-
- 'docs/**'
11-
- 'examples/**'
12-
- '.gitignore'
13-
- '*.rst'
14-
- '*.md'
15-
- '.github/workflows/*.yml'
16-
# re-include current file to not be excluded
17-
- '!.github/workflows/build-windows.yml'
188

199
pull_request:
2010
branches: main
21-
paths-ignore:
22-
- 'docs/**'
23-
- 'examples/**'
24-
- '.gitignore'
25-
- '*.rst'
26-
- '*.md'
27-
- '.github/workflows/*.yml'
28-
# re-include current file to not be excluded
29-
- '!.github/workflows/build-windows.yml'
3011

3112
# the github release drafter can call this workflow
3213
workflow_call:
@@ -57,7 +38,7 @@ jobs:
5738
arch: ${{ matrix.msvc-dev-arch }}
5839

5940
- name: Install uv for speed
60-
uses: astral-sh/setup-uv@v5
41+
uses: astral-sh/setup-uv@v6
6142
with:
6243
version: "0.5.26"
6344

.github/workflows/cppcheck.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/release-gh-draft.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: echo "VER=${GITHUB_REF_NAME#'release/'}" >> $GITHUB_OUTPUT
4242

4343
- name: Generate release attestation
44-
uses: actions/attest-build-provenance@v2.2.3
44+
uses: actions/attest-build-provenance@v2.3.0
4545
with:
4646
subject-path: "pygame-wheels/*"
4747

0 commit comments

Comments
 (0)