Skip to content

Commit bf6346f

Browse files
T-DynamosT-Dynamos
authored
Merge branch 'develop' into sdl_build_optimize
2 parents 032f9d1 + 70f9224 commit bf6346f

94 files changed

Lines changed: 3951 additions & 1028 deletions

File tree

Some content is hidden

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

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ bin/
66
*.pyc
77
**/__pycache__
88
*.egg-info/
9+
docker-data/

‎.github/dependabot.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Keep GitHub Actions up to date with GitHub's Dependabot...
2+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
3+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
4+
version: 2
5+
updates:
6+
- package-ecosystem: github-actions
7+
directory: /
8+
groups:
9+
github-actions:
10+
patterns:
11+
- "*" # Group all Actions updates into a single larger pull request
12+
schedule:
13+
interval: weekly

‎.github/workflows/custom-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: ${{ github.event.inputs.os }}
6161
steps:
6262
- name: Checkout python-for-android
63-
uses: actions/checkout@v4
63+
uses: actions/checkout@v6
6464
- name: Pull the python-for-android docker image
6565
run: make docker/pull
6666
- name: Build python-for-android docker image
@@ -85,7 +85,7 @@ jobs:
8585
if [ -f dist/${{ env.AAB_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAB_ARTIFACT_FILENAME }} dist/${{ github.event.inputs.os }}-${{ github.event.inputs.bootstrap }}-${{ env.AAB_ARTIFACT_FILENAME }}; fi
8686
if [ -f dist/${{ env.AAR_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAR_ARTIFACT_FILENAME }} dist/${{ github.event.inputs.os }}-${{ github.event.inputs.bootstrap }}-${{ env.AAR_ARTIFACT_FILENAME }}; fi
8787
- name: Upload artifacts
88-
uses: actions/upload-artifact@v4
88+
uses: actions/upload-artifact@v7
8989
with:
9090
name: ${{ github.event.inputs.os }}-${{ github.event.inputs.bootstrap }}-artifacts
9191
path: dist

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
docker:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: docker/setup-buildx-action@v3
16+
- uses: actions/checkout@v6
17+
- uses: docker/setup-buildx-action@v4
1818
- run: make docker/build
1919
- name: docker login
2020
if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/')

‎.github/workflows/push.yml‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout python-for-android
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
- name: Set up Python 3.x
2424
uses: actions/setup-python@v6
2525
with:
@@ -35,14 +35,14 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- name: Checkout python-for-android
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
- name: Set up Java 17
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
distribution: 'temurin'
4343
java-version: '17'
4444
- name: Set up Gradle
45-
uses: gradle/actions/setup-gradle@v4
45+
uses: gradle/actions/setup-gradle@v6
4646
- name: Run Spotless check
4747
working-directory: pythonforandroid/bootstraps
4848
run: ./common/build/gradlew spotlessCheck
@@ -54,11 +54,11 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
57+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
5858
os: [ubuntu-latest, macos-latest]
5959
steps:
6060
- name: Checkout python-for-android
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262
- name: Set up Python ${{ matrix.python-version }}
6363
uses: actions/setup-python@v6
6464
with:
@@ -98,15 +98,22 @@ jobs:
9898
- name: Maximize build space
9999
uses: easimon/maximize-build-space@v10
100100
with:
101-
root-reserve-mb: 30720
101+
root-reserve-mb: 4096
102102
swap-size-mb: 1024
103103
remove-dotnet: 'true'
104104
remove-android: 'true'
105105
remove-haskell: 'true'
106106
remove-codeql: 'true'
107107
remove-docker-images: 'true'
108108
- name: Checkout python-for-android
109-
uses: actions/checkout@v5
109+
uses: actions/checkout@v6
110+
- name: Relocate Docker data directory
111+
run: |
112+
sudo systemctl stop docker
113+
sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
114+
echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
115+
sudo systemctl start docker
116+
docker info | grep "Docker Root Dir"
110117
- name: Build python-for-android docker image
111118
run: |
112119
docker build --tag=kivy/python-for-android .
@@ -130,7 +137,7 @@ jobs:
130137
if [ -f dist/${{ env.AAB_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAB_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}; fi
131138
if [ -f dist/${{ env.AAR_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAR_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAR_ARTIFACT_FILENAME }}; fi
132139
- name: Upload artifacts
133-
uses: actions/upload-artifact@v4
140+
uses: actions/upload-artifact@v7
134141
with:
135142
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
136143
path: dist
@@ -156,7 +163,7 @@ jobs:
156163
ANDROID_NDK_HOME: ${HOME}/.android/android-ndk
157164
steps:
158165
- name: Checkout python-for-android
159-
uses: actions/checkout@v5
166+
uses: actions/checkout@v6
160167
- name: Set up Python 3.x
161168
uses: actions/setup-python@v6
162169
with:
@@ -184,7 +191,7 @@ jobs:
184191
if [ -f dist/${{ env.APK_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.APK_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}; fi
185192
if [ -f dist/${{ env.AAB_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAB_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}; fi
186193
- name: Upload artifacts
187-
uses: actions/upload-artifact@v4
194+
uses: actions/upload-artifact@v7
188195
with:
189196
name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
190197
path: dist
@@ -195,9 +202,9 @@ jobs:
195202
runs-on: ubuntu-latest
196203

197204
steps:
198-
- uses: actions/checkout@v5
205+
- uses: actions/checkout@v6
199206
- name: Download Artifacts
200-
uses: actions/download-artifact@v5
207+
uses: actions/download-artifact@v8
201208
with:
202209
name: ubuntu-latest-sdl2-artifacts
203210
path: dist/
@@ -224,17 +231,24 @@ jobs:
224231
- name: Maximize build space
225232
uses: easimon/maximize-build-space@v10
226233
with:
227-
root-reserve-mb: 30720
234+
root-reserve-mb: 4096
228235
swap-size-mb: 1024
229236
remove-dotnet: 'true'
230237
remove-android: 'true'
231238
remove-haskell: 'true'
232239
remove-codeql: 'true'
233240
remove-docker-images: 'true'
234241
- name: Checkout python-for-android (all-history)
235-
uses: actions/checkout@v5
242+
uses: actions/checkout@v6
236243
with:
237244
fetch-depth: 0
245+
- name: Relocate Docker data directory
246+
run: |
247+
sudo systemctl stop docker
248+
sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
249+
echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
250+
sudo systemctl start docker
251+
docker info | grep "Docker Root Dir"
238252
- name: Pull docker image
239253
run: |
240254
make docker/pull
@@ -262,7 +276,7 @@ jobs:
262276
REBUILD_UPDATED_RECIPES_EXTRA_ARGS: --arch=${{ matrix.android_arch }}
263277
steps:
264278
- name: Checkout python-for-android (all-history)
265-
uses: actions/checkout@v5
279+
uses: actions/checkout@v6
266280
with:
267281
fetch-depth: 0
268282
- name: Set up Python 3.x
@@ -294,7 +308,7 @@ jobs:
294308
documentation:
295309
runs-on: ubuntu-latest
296310
steps:
297-
- uses: actions/checkout@v5
311+
- uses: actions/checkout@v6
298312
- name: Requirements
299313
run: |
300314
python -m pip install --upgrade pip

‎.github/workflows/pypi-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
pypi_release:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99
- name: Set up Python 3.x
10-
uses: actions/setup-python@v5
10+
uses: actions/setup-python@v6
1111
with:
1212
python-version: '3.x'
1313
- name: Install dependencies
@@ -19,7 +19,7 @@ jobs:
1919
twine check dist/*
2020
- name: Publish package
2121
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
22-
uses: pypa/gh-action-pypi-publish@v1.13.0
22+
uses: pypa/gh-action-pypi-publish@v1.14.0
2323
with:
2424
user: __token__
2525
password: ${{ secrets.pypi_password }}

‎.github/workflows/support.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
action:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: dessant/support-requests@v4
19+
- uses: dessant/support-requests@v5
2020
with:
2121
github-token: ${{ github.token }}
2222
support-label: 'support'

0 commit comments

Comments
 (0)