Skip to content

Commit 4bffaa6

Browse files
authored
Merge pull request #1131 from AndreMiras/feature/macos_integration_test
✅ Also integration test on macOS
2 parents dccb7e8 + 32c5b83 commit 4bffaa6

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

.github/workflows/test_python.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ jobs:
4545
run: docker run kivy/buildozer --version
4646

4747
Integration:
48-
runs-on: ubuntu-latest
48+
strategy:
49+
matrix:
50+
os:
51+
- 'ubuntu-latest'
52+
- 'macOs-latest'
53+
runs-on: ${{ matrix.os }}
4954
steps:
5055
- name: Setup python
5156
uses: actions/setup-python@v2
@@ -60,8 +65,17 @@ jobs:
6065
- run: buildozer init
6166
- name: SDK, NDK and p4a download
6267
run: |
63-
sed "s/# android.accept_sdk_license = False/android.accept_sdk_license = True/" -i buildozer.spec
68+
sed -i.bak "s/# android.accept_sdk_license = False/android.accept_sdk_license = True/" buildozer.spec
6469
buildozer android p4a -- --help
70+
# Install OS specific dependencies
71+
- name: Install Linux dependencies
72+
if: matrix.os == 'ubuntu-latest'
73+
run: sudo apt -y install automake
74+
- name: Install macOS dependencies
75+
if: matrix.os == 'macOS-latest'
76+
run: |
77+
brew install automake
78+
sudo ln -sfn /usr/local/opt/openssl /usr/local/ssl
6579
- name: buildozer android debug
6680
run: |
6781
touch main.py

docs/source/installation.rst

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ First, install the buildozer project with::
1313
Targeting Android
1414
-----------------
1515

16-
Android on Ubuntu 18.04 (64bit)
16+
Android on Ubuntu 20.04 (64bit)
1717
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1818

1919
(expected to work as well in later version, but only regularly tested in the latest LTS)
@@ -28,6 +28,20 @@ Android on Ubuntu 18.04 (64bit)
2828
export PATH=$PATH:~/.local/bin/
2929

3030

31+
Android on macOS
32+
~~~~~~~~~~~~~~~~
33+
34+
::
35+
36+
brew install openssl
37+
sudo ln -sfn /usr/local/opt/openssl /usr/local/ssl
38+
brew install pkg-config autoconf automake
39+
python3 -m pip install --user --upgrade Cython==0.29.19 virtualenv # the --user should be removed if you do this in a venv
40+
41+
# add the following line at the end of your `~/.bashrc` file
42+
export PATH=$PATH:~/Library/Python/3.7/bin
43+
44+
3145
TroubleShooting
3246
~~~~~~~~~~~~~~~
3347

@@ -72,4 +86,4 @@ Install pip and virtualenv
7286

7387
::
7488

75-
python -m pip install --user --upgrade pip virtualenv kivy-ios
89+
python3 -m pip install --user --upgrade pip virtualenv kivy-ios

0 commit comments

Comments
 (0)