From 6a61648b7a3b05c00f7b8fa620665902f6664b83 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Tue, 18 Apr 2017 08:31:59 +0300 Subject: [PATCH] Remove pupy-binaries from modules Currently all templates (android is single exception) can be automatically build from sources. There is zero need to download huge history every time on recursive checkout. Also references to templates head are broken every time. It's better to write proper script for android and forget about this eternaly. To keep pupy-binaries up2date it's better to setup CI to build and release them. --- .gitmodules | 4 ---- .travis.yml | 1 + pupy/payload_templates | 1 - pupy/payload_templates/.keep | 0 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 pupy/payload_templates create mode 100644 pupy/payload_templates/.keep diff --git a/.gitmodules b/.gitmodules index fffbbb5d..b3fa9bc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "pupy/payload_templates"] - path = pupy/payload_templates - url = ../pupy-binaries.git - shallow = false [submodule "pupy/external/LaZagne"] path = pupy/external/LaZagne url = https://github.com/AlessandroZ/LaZagne diff --git a/.travis.yml b/.travis.yml index cb0c9664..f43eed2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ after_success: - export REPO=alxchk/pupy - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` +- wget -qO $TRAVIS_BUILD_DIR/pupy/pupy/payload_templates/pupy.apk https://github.com/n1nj4sec/pupy-binaries/raw/master/pupy.apk - cd $TRAVIS_BUILD_DIR/pupy && docker build -f Dockerfile -t $REPO:$COMMIT . - cd $TRAVIS_BUILD_DIR/pupy && docker tag $REPO:$COMMIT $REPO:$TAG - cd $TRAVIS_BUILD_DIR/pupy && docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER diff --git a/pupy/payload_templates b/pupy/payload_templates deleted file mode 160000 index 2508ebb4..00000000 --- a/pupy/payload_templates +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2508ebb42d7c9629fc0cc3d8ed3795c116679d22 diff --git a/pupy/payload_templates/.keep b/pupy/payload_templates/.keep new file mode 100644 index 00000000..e69de29b