From d6b99dfb9166b0d0a44a9b656fa055b9432218a6 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Tue, 4 Jul 2017 10:59:15 +0300 Subject: [PATCH] Clean more space.. --- .travis.yml | 18 ++++++++++++++---- client/android_sources/build.sh | 6 +++++- client/sources-linux/Makefile | 1 + client/sources-linux/build.sh | 2 ++ client/sources/Makefile | 1 + client/sources/build.sh | 3 ++- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b244163..7a5cdc73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ os: - linux dist: trusty before_script: - - cd $TRAVIS_BUILD_DIR/pupy && rm -f payload_templates/* + - cd $TRAVIS_BUILD_DIR/pupy && rm -f payload_templates/pupy* - if [ -f $HOME/.cache/win.tgz ]; then tar -C $TRAVIS_BUILD_DIR/client/sources -zxf $HOME/.cache/win.tgz; fi - if [ -f $HOME/.cache/lin.tgz ]; then sudo -E tar -C $TRAVIS_BUILD_DIR/client/sources-linux -zxf $HOME/.cache/lin.tgz; fi - if [ -f $HOME/.cache/android.tgz ]; then tar -C $HOME -zxf $HOME/.cache/android.tgz; fi @@ -23,14 +23,23 @@ before_script: script: - sh -e /etc/init.d/xvfb start || systemctl start xvfb - sleep 3 + - df -h - ( cd $TRAVIS_BUILD_DIR/client/sources && ./buildenv.sh ) & ( cd $TRAVIS_BUILD_DIR/client/sources-linux && sudo -E ./buildenv.sh ) & - ( cd $TRAVIS_BUILD_DIR/client/android_sources && ln -sf buildozer.spec.example buildozer.spec && buildozer android update ) & wait + ( cd $TRAVIS_BUILD_DIR/client/android_sources && ./build.sh && + rm -f $HOME/.buildozer/android-sdk_* && + rm -rf $HOME/.buildozer/android-ndk* ) & + wait + - df -h - ( cd $TRAVIS_BUILD_DIR/client/sources && ./build.sh ) & - ( cd $TRAVIS_BUILD_DIR/client/sources-linux && sudo -E ./build.sh ) & - ( cd $TRAVIS_BUILD_DIR/client/android_sources && buildozer android release; mv .buildozer/android/platform/build/dists/pupy/bin/Wi-Fi-0.1-release-unsigned.apk ../../pupy/payload_templates/pupy.apk ) & wait + ( cd $TRAVIS_BUILD_DIR/client/sources-linux && sudo -E ./build.sh ) & wait - ls -l $TRAVIS_BUILD_DIR/pupy/payload_templates + - df -h before_cache: + - rm -rf $HOME/.cache && mkdir -p $HOME/.cache + - rm -rf $TRAVIS_BUILD_DIR/client/sources/buildenv/downloads + - sudo rm -rf $TRAVIS_BUILD_DIR/client/sources-linux/buildenv/downloads + - rm -rf $TRAVIS_BUILD_DIR/client/android_sources/.buildozer/android/app - ( if [ ! -f $HOME/.cache/win.tgz ]; then tar --remove-files -C $TRAVIS_BUILD_DIR/client/sources -zcf $HOME/.cache/win.tgz buildenv; fi; rm -rf $TRAVIS_BUILD_DIR/client/sources/buildenv ) & ( if [ ! -f $HOME/.cache/lin.tgz ]; then sudo -E tar --remove-files -C $TRAVIS_BUILD_DIR/client/sources-linux -zcf $HOME/.cache/lin.tgz buildenv; fi; sudo rm -rf $TRAVIS_BUILD_DIR/client/sources-linux/buildenv ) & ( if [ ! -f $HOME/.cache/android-app.tgz ]; then tar --remove-files -C $TRAVIS_BUILD_DIR/client/android_sources -zcf $HOME/.cache/android-app.tgz .buildozer; fi; rm -rf $TRAVIS_BUILD_DIR/client/android_sources/.buildozer ) & @@ -40,6 +49,7 @@ before_cache: .buildozer/android/platform/android-sdk-20 .buildozer/android/platform/apache-ant-1.9.4; fi; rm -rf $HOME/.buildozer ) & wait + - df -h cache: apt: true directories: diff --git a/client/android_sources/build.sh b/client/android_sources/build.sh index 8ab64187..fe7150c3 100755 --- a/client/android_sources/build.sh +++ b/client/android_sources/build.sh @@ -3,4 +3,8 @@ pip install --user --upgrade git+https://github.com/kivy/buildozer [ -f buildozer.spec ] || ln -sf buildozer.spec.example buildozer.spec buildozer android release mv .buildozer/android/platform/build/dists/pupy/bin/Wi-Fi-0.1-release-unsigned.apk \ - ../../pupy/payload_templates/pupy.apk + ../../pupy/payload_templates/pupy.apk || exit 1 +rm -rf .buildozer/android/platform/build +rm -rf ~/.buildozer/android/platform/*.tar.gz +rm -rf ~/.buildozer/android/platform/*.tgz +rm -rf ~/.buildozer/android/platform/*.tar.bz2 diff --git a/client/sources-linux/Makefile b/client/sources-linux/Makefile index 64b63d98..18be95b5 100644 --- a/client/sources-linux/Makefile +++ b/client/sources-linux/Makefile @@ -157,6 +157,7 @@ clean: rm -f linux-inject/*.o rm -f resources/bootloader.pyc rm -f resources/*.c + rm -f resources/$(ARCH)/*.c distclean: clean rm -f import-tab.c diff --git a/client/sources-linux/build.sh b/client/sources-linux/build.sh index 5d943d43..e3f7d616 100755 --- a/client/sources-linux/build.sh +++ b/client/sources-linux/build.sh @@ -29,6 +29,7 @@ make clean make -j PIE= UNCOMPRESSED=1 make clean make -j DEBUG=1 PIE= UNCOMPRESSED=1 +make distclean __CMDS__ umount buildenv/lin32/dev @@ -52,6 +53,7 @@ make clean make -j UNCOMPRESSED=1 make clean make -j DEBUG=1 UNCOMPRESSED=1 +make distclean __CMDS__ umount buildenv/lin64/dev diff --git a/client/sources/Makefile b/client/sources/Makefile index 2f62be58..207a93eb 100644 --- a/client/sources/Makefile +++ b/client/sources/Makefile @@ -135,6 +135,7 @@ clean: rm -f *.pyc rm -f resources/bootloader.pyc rm -f resources/*.c + rm -f resources/$(ARCH)/*.c rm -f $(PYOBJS) $(COMMON_OBJS) distclean: clean diff --git a/client/sources/build.sh b/client/sources/build.sh index 29ccda30..3b793415 100755 --- a/client/sources/build.sh +++ b/client/sources/build.sh @@ -9,7 +9,7 @@ make -f Makefile -j ARCH=win32 UNCOMPRESSED=1 clean make -f Makefile -j ARCH=win32 UNCOMPRESSED=1 make -f Makefile -j DEBUG=1 ARCH=win32 UNCOMPRESSED=1 clean make -f Makefile -j DEBUG=1 ARCH=win32 UNCOMPRESSED=1 -make -f Makefile -j ARCH=win64 clean +make -f Makefile -j ARCH=win64 distclean make -f Makefile -j ARCH=win64 make -f Makefile -j DEBUG=1 ARCH=win64 clean make -f Makefile -j DEBUG=1 ARCH=win64 @@ -17,3 +17,4 @@ make -f Makefile -j ARCH=win64 UNCOMPRESSED=1 clean make -f Makefile -j ARCH=win64 UNCOMPRESSED=1 make -f Makefile -j DEBUG=1 ARCH=win64 UNCOMPRESSED=1 clean make -f Makefile -j DEBUG=1 ARCH=win64 UNCOMPRESSED=1 +make -f Makefile -j ARCH=win64 UNCOMPRESSED=1 distclean