Merge pull request #5555 from Mailaender/travis-release-polish

Tweaked Travis CI deployment

.travis.yml

@@ -35,7 +35,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - echo $TRAVIS_TAG
+ - DOTVERSION=`echo $TRAVIS_TAG | sed "s/-/\\./g"`
  - cd packaging
  - mkdir build
  - ./package-all.sh $TRAVIS_TAG build
@@ -44,10 +44,10 @@ deploy:
   api_key:
     secure: "cMC68erxuf0jb4Pe0sOH4m1f7I2LWPUatD9BC0WeZ9PwTnWOzrm0hnjZIES4TTKVo8WIfZIiCfxpdAFeoh6bomG2MsKwSKMc8qHGhfNGqPnyzYh6zdPZaA+4Q3TDQI3DrziyDnQUFeH1h/7UZLDLxtDrOtcYcGdNg5VjvV9fJ7g="
   file:
-    - packaging/build/OpenRA-$TRAVIS_TAG.exe
-    - packaging/build/OpenRA-$TRAVIS_TAG.zip
-    - packaging/build/openra-$TRAVIS_TAG-1-noarch.rpm
-    - packaging/build/openra_$TRAVIS_TAG_all.deb
+    - build/OpenRA-$TRAVIS_TAG.exe
+    - build/OpenRA-$TRAVIS_TAG.zip
+    - build/openra-$DOTVERSION-1-noarch.rpm
+    - build/openra_$DOTVERSION_all.deb
   skip_cleanup: true
   on:
     all_branches: true

packaging/linux/buildpackage.sh

@@ -38,32 +38,29 @@ cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
 
 cd packaging/linux
 
-(
-    echo "Building Debian package."
-    cd deb
-    ./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" &> package.log
-    if [ $? -ne 0 ]; then
-        echo "Debian package build failed, refer to $PWD/package.log."
-    fi
-) &
+pushd deb
+echo "Building Debian package."
+./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "Debian package build failed."
+fi
+popd
 
-(
-    echo "Building Arch-Linux package."
-    cd pkgbuild
-    sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" &> package.log
-    if [ $? -ne 0 ]; then
-        echo "Arch-Linux package build failed, refer to $PWD/package.log."
-    fi
-) &
+pushd pkgbuild
+echo "Building Arch-Linux package."
+sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "Arch-Linux package build failed."
+fi
+popd
 
-(
-    echo "Building RPM package."
-    cd rpm
-    sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" &> package.log
-    if [ $? -ne 0 ]; then
-        echo "RPM package build failed, refer to $PWD/package.log."
-    fi
-) &
+pushd rpm
+echo "Building RPM package."
+sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "RPM package build failed."
+fi
+popd
 
 wait
 

packaging/package-all.sh

@@ -21,7 +21,7 @@ make package
 # Remove the mdb files that are created during `make`
 find . -path "*.mdb" -delete
 
-rm Changelog.md
+test -e Changelog.md && rm Changelog.md
 wget https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md
 markdown Changelog.md > CHANGELOG.html
 markdown README.md > README.html
@@ -74,40 +74,35 @@ cp thirdparty/RestSharp.dll packaging/built
 # Copy game icon for windows package
 cp OpenRA.Game/OpenRA.ico packaging/built
 
-#
-# Change into packaging directory and run the 
-# platform-dependant packaging in parallel
-#
 cd packaging
 echo "Creating packages..."
 
-(
-    cd windows
-    makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi &> package.log
-    if [ $? -eq 0 ]; then
-        mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
-    else
-        echo "Windows package build failed, refer to windows/package.log."
-    fi
-) &
+pushd windows
+echo "Building Windows setup.exe"
+makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
+if [ $? -eq 0 ]; then
+    mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
+else
+    echo "Windows package build failed."
+fi
+popd
 
-(
-    cd osx
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR" &> package.log
-    if [ $? -ne 0 ]; then
-        echo "OS X package build failed, refer to osx/package.log."
-    fi
-) &
+pushd osx
+echo "Zipping OS X package"
+sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
+if [ $? -ne 0 ]; then
+    echo "OS X package build failed."
+fi
+popd
 
-(
-    cd linux
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR" &> package.log
-    if [ $? -ne 0 ]; then
-        echo "Linux package build failed, refer to linux/package.log."
-    fi
-) &
+pushd linux
+echo "Building Linux packages"
+sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
+if [ $? -ne 0 ]; then
+    echo "Linux package build failed."
+fi
+popd
 
-wait
 echo "Package build done."
 
 rm -rf $BUILTDIR