Merge pull request #5558 from Mailaender/travis-fixups

Fixed RPM deployment on Travis CI
2014-06-05 23:29:30 +12:00
parent 90dbf3b5cd 76da946075
commit 732d2da721
2 changed files with 3 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,10 @@ deploy:
  file:
    - build/OpenRA-$TRAVIS_TAG.exe
    - build/OpenRA-$TRAVIS_TAG.zip
-    - build/openra-$DOTVERSION-1-noarch.rpm
+    - build/openra-$DOTVERSION-1.noarch.rpm
    - build/openra_$DOTVERSION_all.deb
  skip_cleanup: true
  on:
-    all_branches: false
+    all_branches: true
    tags: true
    repo: OpenRA/OpenRA
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -7,6 +7,7 @@ then
 fi

 mkdir ~/rpmbuild/
+mkdir ~/rpmbuild/SPECS

 # Replace any dashes in the version string with periods
 PKGVERSION=`echo $1 | sed "s/-/\\./g"`