Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ on:

jobs:
docker:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v7
- name: Use classic Docker storage
run: |
echo '{"features":{"containerd-snapshotter":false}}' | sudo tee /etc/docker/daemon.json
sudo systemctl restart docker
docker info --format 'Storage driver: {{ .Driver }}; Docker root: {{ .DockerRootDir }}'
test "$(docker info --format '{{ .Driver }}')" = overlay2
- uses: docker/setup-buildx-action@v4
- run: make docker/build
- name: docker login
Expand Down
33 changes: 22 additions & 11 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ${{ matrix.runs_on }}
strategy:
matrix:
runs_on: [ubuntu-latest]
runs_on: [ubuntu-24.04]
bootstrap:
- name: sdl2
target: testapps-with-numpy
Expand All @@ -107,13 +107,19 @@ jobs:
remove-docker-images: 'true'
- name: Checkout python-for-android
uses: actions/checkout@v7
- name: Relocate Docker data directory
- name: Configure classic Docker storage on build volume
run: |
sudo systemctl stop docker
sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
sudo tee /etc/docker/daemon.json <<EOF
{
"data-root": "${GITHUB_WORKSPACE}/docker-data",
"features": {"containerd-snapshotter": false}
}
EOF
sudo systemctl start docker
docker info | grep "Docker Root Dir"
docker info --format 'Storage driver: {{ .Driver }}; Docker root: {{ .DockerRootDir }}'
test "$(docker info --format '{{ .Driver }}')" = overlay2
- name: Build python-for-android docker image
run: |
docker build --tag=kivy/python-for-android .
Expand Down Expand Up @@ -206,7 +212,7 @@ jobs:
- name: Download Artifacts
uses: actions/download-artifact@v8
with:
name: ubuntu-latest-sdl2-artifacts
name: ubuntu-24.04-sdl2-artifacts
path: dist/

- name: Setup and start Android Emulator
Expand All @@ -217,9 +223,9 @@ jobs:
script: ci/run_emulator_tests.sh

ubuntu_rebuild_updated_recipes:
name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-latest ]
name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-24.04 ]
needs: [flake8, spotless]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
# continue on error to see failures across all architectures
continue-on-error: true
strategy:
Expand All @@ -242,13 +248,19 @@ jobs:
uses: actions/checkout@v7
with:
fetch-depth: 0
- name: Relocate Docker data directory
- name: Configure classic Docker storage on build volume
run: |
sudo systemctl stop docker
sudo mkdir -p "${GITHUB_WORKSPACE}/docker-data"
echo '{"data-root": "'${GITHUB_WORKSPACE}/docker-data'"}' | sudo tee /etc/docker/daemon.json
sudo tee /etc/docker/daemon.json <<EOF
{
"data-root": "${GITHUB_WORKSPACE}/docker-data",
"features": {"containerd-snapshotter": false}
}
EOF
sudo systemctl start docker
docker info | grep "Docker Root Dir"
docker info --format 'Storage driver: {{ .Driver }}; Docker root: {{ .DockerRootDir }}'
test "$(docker info --format '{{ .Driver }}')" = overlay2
- name: Pull docker image
run: |
make docker/pull
Expand Down Expand Up @@ -317,4 +329,3 @@ jobs:
run: sphinx-build -b linkcheck doc/source doc/build
- name: Generate documentation
run: sphinx-build doc/source doc/build

Loading