From da27860d822f7adc8568bf37b332bb02181894b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 19 Oct 2013 15:53:42 +0200 Subject: [PATCH] move source download from package-all.sh for Travis --- packaging/checkout-and-build.sh | 6 ++++++ packaging/package-all.sh | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packaging/checkout-and-build.sh b/packaging/checkout-and-build.sh index eadc4a88df..30fa0c5334 100755 --- a/packaging/checkout-and-build.sh +++ b/packaging/checkout-and-build.sh @@ -61,6 +61,12 @@ fi ./package-all.sh $TAG ~/openra-package/packages/ +echo "Downloading source code packages from GitHub..." +curl -s -L -o "$OUTPUTDIR/$TAG.tar.gz" "https://github.com/OpenRA/OpenRA/archive/$TAG.tar.gz" +if [ $? -ne 0 ]; then + echo "Source code package download failed." +fi + ./upload-all.sh $TAG ~/openra-package/packages ./update-wiki.sh diff --git a/packaging/package-all.sh b/packaging/package-all.sh index a115b5546c..cd6df0f1fe 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -98,13 +98,6 @@ echo "Creating packages..." fi ) & -( - echo "Downloading source code packages from GitHub." - curl -s -L -o "$OUTPUTDIR/$TAG.tar.gz" "https://github.com/OpenRA/OpenRA/archive/$TAG.tar.gz" - if [ $? -ne 0 ]; then - echo "Source code package download failed." - fi -) & wait echo "Package build done."