Skip to content

Commit 1731b50

Browse files
authored
Merge branch 'pygame-community:main' into scrap
2 parents dfa7768 + e307f2b commit 1731b50

File tree

161 files changed

+6783
-3473
lines changed

Some content is hidden

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

161 files changed

+6783
-3473
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
arch: [s390x, ppc64le]
4848

4949
steps:
50-
- uses: actions/checkout@v3.3.0
50+
- uses: actions/checkout@v3.4.0
5151

5252
- name: Build sources and run tests
5353
uses: uraimo/[email protected]

.github/workflows/build-emsdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
4848

4949
steps:
50-
- uses: actions/checkout@v3.3.0
50+
- uses: actions/checkout@v3.4.0
5151

5252
- name: Cache Cython
5353
id: cache-cython

.github/workflows/build-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
macarch: [arm64, x86_64]
4646

4747
steps:
48-
- uses: actions/checkout@v3.3.0
48+
- uses: actions/checkout@v3.4.0
4949

5050
- name: Test for Mac Deps cache hit
5151
id: macdep-cache
@@ -149,7 +149,7 @@ jobs:
149149
CIBW_BUILD_VERBOSITY: 2
150150

151151
steps:
152-
- uses: actions/checkout@v3.3.0
152+
- uses: actions/checkout@v3.4.0
153153

154154
- name: pip cache
155155
uses: actions/[email protected]
@@ -165,7 +165,7 @@ jobs:
165165
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
166166

167167
- name: Build and test wheels
168-
uses: pypa/[email protected].0
168+
uses: pypa/[email protected].1
169169

170170
- uses: actions/upload-artifact@v3
171171
with:

.github/workflows/build-manylinux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
CIBW_BUILD_VERBOSITY: 2
8080

8181
steps:
82-
- uses: actions/checkout@v3.3.0
82+
- uses: actions/checkout@v3.4.0
8383

8484
- name: Log in to the Container registry
8585
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
@@ -118,7 +118,7 @@ jobs:
118118
CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
119119
CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
120120

121-
uses: pypa/[email protected].0
121+
uses: pypa/[email protected].1
122122

123123
# We upload the generated files under github actions assets
124124
- name: Upload dist

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ jobs:
5151
os: [ubuntu-20.04, ubuntu-22.04]
5252

5353
steps:
54-
- uses: actions/checkout@v3.3.0
54+
- uses: actions/checkout@v3.4.0
5555

5656
- name: Install deps
5757
# install numpy from pip and not apt because the one from pip is newer,
5858
# and has typestubs
5959
run: |
60-
sudo apt-mark hold grub-efi-amd64-signed
6160
sudo apt-get update --fix-missing
6261
sudo apt-get upgrade
6362
sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
CIBW_BUILD_VERBOSITY: 2
147147

148148
steps:
149-
- uses: actions/checkout@v3.3.0
149+
- uses: actions/checkout@v3.4.0
150150

151151
- uses: TheMrMilchmann/setup-msvc-dev@v2 # this lets us use the developer command prompt on windows
152152
with:

.github/workflows/cppcheck.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ jobs:
2222
runs-on: ubuntu-20.04
2323

2424
steps:
25-
- uses: actions/checkout@v3.3.0
25+
- uses: actions/checkout@v3.4.0
2626

2727
- name: Install deps
2828
run: |
29-
sudo apt-mark hold grub-efi-amd64-signed
3029
sudo apt-get update --fix-missing
3130
sudo apt-get upgrade
3231
sudo apt install cppcheck

.github/workflows/format-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-22.04
3030

3131
steps:
32-
- uses: actions/checkout@v3.3.0
32+
- uses: actions/checkout@v3.4.0
3333

3434
- name: Install deps
3535
run: python3 -m pip install pylint black clang-format sphinx

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
needs: [manylinux, macos, windows, sdist]
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3.3.0
24+
- uses: actions/checkout@v3.4.0
2525

2626
- name: Download all artifacts
2727
uses: actions/download-artifact@v3

.github/workflows/release-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3.3.0
11+
- uses: actions/checkout@v3.4.0
1212

1313
- name: Pull all release assets
1414
uses: robinraju/[email protected]

0 commit comments

Comments
 (0)