Simplifies Dockerfile and fix GitHub runner space · ERASTUSG/python-for-android@b5dfdaf · GitHub

ERASTUSG / python-for-android Public

forked from kivy/python-for-android

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b5dfdaf

Browse filesBrowse the repository at this point in the historyBrowse files

AndreMiras

committed

Simplifies Dockerfile and fix GitHub runner space

Simplifies the Dockerfile as Python 2 was dropped. Renames to default "Dockerfile" so it's picked up by docker hub automatically. This is a follow-up for: kivy#2105 Adds the GitHub action build badge. Free up space before building the APKs to avoid the GitHub Action runner being full. The error was: ``` mkdir -p /home/user/.android/android-ndk-r19b \ && unzip -q android-ndk-r19b-linux-x86_64.zip -d /home/user/.android \ && ln -sfn /home/user/.android/android-ndk-r19b /home/user/.android/android-ndk \ && rm -f android-ndk-r19b-linux-x86_64.zip Error processing tar file(exit status 1): write /home/user/.android/android-ndk-r19b/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/lib/bfd-plugins/LLVMgold.so: no space left on device Makefile:61: recipe for target 'docker/build' failed make: *** [docker/build] Error 1 ```` https://github.com/kivy/python-for-android/actions/runs/81658805 The "Free disk space" step could clear about ~10G and helped making the build pass. See output logs for details.

1 parent 265fe7f commit b5dfdaf
Copy full SHA for b5dfdaf

4 files changed

+21-8Lines changed: 21 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • push.yml
• Dockerfile
• Makefile
• README.md

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/push.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/push.yml

+18Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -52,6 +52,15 @@ jobs:
52	52	steps:
53	53	- name: Checkout python-for-android
54	54	uses: actions/checkout@v2
	55	+ # helps with GitHub runner getting out of space
	56	+ - name: Free disk space
	57	+ run: |
	58	+ df -h
	59	+ sudo swapoff -a
	60	+ sudo rm -f /swapfile
	61	+ sudo apt -y clean
	62	+ docker rmi $(docker image ls -aq)
	63	+ df -h
55	64	- name: Pull docker image
56	65	run: |
57	66	make docker/pull
@@ -75,6 +84,15 @@ jobs:
75	84	uses: actions/checkout@v2
76	85	with:
77	86	ref: 'develop'
	87	+ # helps with GitHub runner getting out of space
	88	+ - name: Free disk space
	89	+ run: |
	90	+ df -h
	91	+ sudo swapoff -a
	92	+ sudo rm -f /swapfile
	93	+ sudo apt -y clean
	94	+ docker rmi $(docker image ls -aq)
	95	+ df -h
78	96	- name: Pull docker image
79	97	run: |
80	98	make docker/pull

Collapse file

‎Dockerfile.py3‎ ‎Dockerfile‎Dockerfile.py3 renamed to Dockerfile

Copy file name to clipboardExpand all lines: Dockerfile

+1-7Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -3,7 +3,7 @@
3	3	# - python-for-android dependencies
4	4	#
5	5	# Build with:
6		- # docker build --tag=p4a --file Dockerfile.py3 .
	6	+ # docker build --tag=p4a --file Dockerfile .
7	7	#
8	8	# Run with:
9	9	# docker run -it --rm p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
@@ -71,8 +71,6 @@ RUN dpkg --add-architecture i386 \
71	71	openjdk-8-jdk \
72	72	patch \
73	73	pkg-config \
74		- python \
75		- python-pip \
76	74	python3 \
77	75	python3-dev \
78	76	python3-pip \
@@ -95,10 +93,6 @@ RUN useradd --create-home --shell /bin/bash ${USER}
95	93	RUN usermod -append --groups sudo ${USER}
96	94	RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
97	95
98		- # install cython for python 2 (for python 3 it's inside the venv)
99		- RUN pip2 install --upgrade Cython==0.28.6 \
100		- && rm -rf ~/.cache/
101		-
102	96	WORKDIR ${WORK_DIR}
103	97	RUN mkdir ${ANDROID_HOME} && chown --recursive ${USER} ${HOME_DIR} ${ANDROID_HOME}
104	98	USER ${USER}

Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -58,7 +58,7 @@ docker/pull:
58	58	docker pull $(DOCKER_IMAGE):latest || true
59	59
60	60	docker/build:
61		- docker build --cache-from=$(DOCKER_IMAGE) --tag=$(DOCKER_IMAGE) --file=Dockerfile.py3 .
	61	+ docker build --cache-from=$(DOCKER_IMAGE) --tag=$(DOCKER_IMAGE) .
62	62
63	63	docker/push:
64	64	docker push $(DOCKER_IMAGE)

Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -2,6 +2,7 @@ python-for-android
2	2	==================
3	3
4	4	[](https://travis-ci.org/kivy/python-for-android)
	5	+ [](https://github.com/kivy/python-for-android/actions?query=workflow%3A%22Unit+tests+%26+build+apps%22)
5	6	[](https://coveralls.io/github/kivy/python-for-android?branch=develop)
6	7	[](#backers)
7	8	[](#sponsors)

0 commit comments

Comments

0 (0)