diff --git a/.travis.yml b/.travis.yml index bfcef0231..31c40c6b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ after_success: jobs: include: - stage: binary builds + name: "Windows build" sudo: true language: c python: false @@ -36,11 +37,26 @@ jobs: services: - docker install: - - sudo docker build --no-cache -t electrum-wine-builder-img ./contrib/build-wine/docker/ + - sudo docker build --no-cache -t electrum-wine-builder-img ./contrib/build-wine/docker/ script: - sudo docker run --name electrum-wine-builder-cont -v $PWD:/opt/wine64/drive_c/electrum --rm --workdir /opt/wine64/drive_c/electrum/contrib/build-wine electrum-wine-builder-img ./build.sh after_success: true - - os: osx + - name: "Android build" + language: python + python: 3.7 + services: + - docker + install: + - ./contrib/make_packages + - sudo docker build --no-cache -t electrum-android-builder-img electrum/gui/kivy/tools + script: + - sudo chown -R 1000:1000 . + - sudo docker run -it -u 1000:1000 --rm --name electrum-android-builder-cont -v $PWD:/home/user/wspace/electrum --workdir /home/user/wspace/electrum electrum-android-builder-img ./contrib/make_apk + - ls -la bin + - if [ $(ls bin | grep -c Electrum-*) -eq 0 ]; then exit 1; fi + after_success: true + - name: "MacOS build" + os: osx language: c env: - TARGET_OS=macOS diff --git a/contrib/make_packages b/contrib/make_packages index 9cfd32bb2..0e4ac67b1 100755 --- a/contrib/make_packages +++ b/contrib/make_packages @@ -3,11 +3,8 @@ contrib=$(dirname "$0") test -n "$contrib" -a -d "$contrib" || exit -whereis pip3 -if [ $? -ne 0 ] ; then echo "Install pip3" ; exit ; fi - rm "$contrib"/../packages/ -r #Install pure python modules in electrum directory -pip3 install -r $contrib/deterministic-build/requirements.txt -t $contrib/../packages +python3 -m pip install -r $contrib/deterministic-build/requirements.txt -t $contrib/../packages diff --git a/electrum/gui/kivy/tools/Dockerfile b/electrum/gui/kivy/tools/Dockerfile index 0300d8620..71a04ee5c 100644 --- a/electrum/gui/kivy/tools/Dockerfile +++ b/electrum/gui/kivy/tools/Dockerfile @@ -56,10 +56,10 @@ RUN apt -y update -qq \ RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses > /dev/null # download platforms, API, build tools -RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-24" && \ - "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-28" && \ - "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3" && \ - "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "extras;android;m2repository" && \ +RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-24" > /dev/null && \ + "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-28" > /dev/null && \ + "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;28.0.3" > /dev/null && \ + "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "extras;android;m2repository" > /dev/null && \ chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"