From c811be17952f87fecb6b3593e643dcc5d89d74b8 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 7 Jun 2014 15:41:30 +1200 Subject: [PATCH] Fix arch package building on Travis. --- .travis.yml | 8 ++++++-- packaging/linux/pkgbuild/buildpackage.sh | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 646388980d..b9e0b9363b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,10 @@ notifications: skip_join: true before_deploy: - - sudo apt-get install nsis markdown dpkg rpm + - sudo apt-get install nsis markdown dpkg rpm libarchive-dev m4 fakeroot bsdtar + - wget ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz -O /tmp/pacman-4.0.3.tar.gz + - tar -xzvf pacman-4.0.3.tar.gz + - cd pacman-4.0.3 && ./configure --disable-doc --prefix=/usr && make && sudo make install - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"` - cd packaging - mkdir build @@ -47,8 +50,9 @@ deploy: file: - build/OpenRA-${TRAVIS_TAG}.exe - build/OpenRA-${TRAVIS_TAG}.zip - - build/openra-${DOTVERSION}-1.noarch.rpm - build/openra_${DOTVERSION}_all.deb + - build/openra-${DOTVERSION}-1-any.pkg.tar.gz + - build/openra-${DOTVERSION}-1.noarch.rpm skip_cleanup: true on: all_branches: true diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh index 75bb5b7a83..d7ef8f92c8 100755 --- a/packaging/linux/pkgbuild/buildpackage.sh +++ b/packaging/linux/pkgbuild/buildpackage.sh @@ -13,10 +13,10 @@ sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD rootdir=`readlink -f $2` sed -i "s|{ROOT}|$rootdir|" PKGBUILD -makepkg --holdver -p PKGBUILD +makepkg --holdver --nodeps -p PKGBUILD if [ $? -ne 0 ]; then exit 1 fi -mv openra-$PKGVERSION-1-any.pkg.tar.xz $3 +mv openra-$PKGVERSION-1-any.pkg.tar.gz $3