Skip to content

Commit

Permalink
💚 Add testapps/python3-with-numpy/%
Browse files Browse the repository at this point in the history
Fix our `CI` travis tests by explicitly omit the numpy build for MacOsX.
Yeah...not actually a solution for MacOsX...but at least we will have
the `green tick mark` for our `CI` tests...but we have a problem with
MacOsX and numpy recipe :<

See also: #2073
  • Loading branch information
opacam committed Mar 14, 2020
1 parent cbebd95 commit 237de3f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Build apk python3 ${{ matrix.build-arch }}
run: |
mkdir -p apks
make docker/run/make/with-artifact/testapps/python3/${{ matrix.build-arch }}
make docker/run/make/with-artifact/testapps/python3-with-numpy/${{ matrix.build-arch }}
- uses: actions/upload-artifact@v1
with:
name: unit_tests_app__python3-${{ matrix.build-arch }}-debug-1.1.apk
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
name: Python 3 arm64-v8a (with numpy)
stage: build testapps
before_script: make docker/pull
script: make docker/run/make/testapps/python3/arm64-v8a
script: make docker/run/make/testapps/python3-with-numpy/arm64-v8a
- <<: *testapps
name: Python 3 armeabi-v7a
os: osx
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,19 @@ testapps/python2/%: virtualenv
--requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools \
--arch=$($@_APP_ARCH)

testapps/python3/%: virtualenv
testapps/python3-with-numpy/%: virtualenv
$(eval $@_APP_ARCH := $(shell basename $*))
. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
--requirements sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
--arch=$($@_APP_ARCH)

testapps/python3/%: virtualenv
$(eval $@_APP_ARCH := $(shell basename $*))
. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
--arch=$($@_APP_ARCH)

clean:
find . -type d -name "__pycache__" -exec rm -r {} +
find . -type d -name "*.egg-info" -exec rm -r {} +
Expand Down

0 comments on commit 237de3f

Please sign in to comment.