epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5557 from Mailaender/travis-deploy-fixes

Browse Source 
Fixed Linux packaging failing Travis CI deployment
This commit is contained in:
Paul Chote
2014-06-05 22:24:18 +12:00
parent 05aec743d3 4b3935b010
commit 90dbf3b5cd
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -6,7 +6,7 @@ language: c
# Make sure build dependencies are installed. # Make sure build dependencies are installed.
install: install:
- sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6
cache: apt cache: apt
# Run the build script # Run the build script
@@ -35,10 +35,11 @@ notifications:
skip_join: true skip_join: true
before_deploy: before_deploy:
- sudo apt-get install nsis markdown dpkg rpm
- DOTVERSION=`echo $TRAVIS_TAG | sed "s/-/\\./g"` - DOTVERSION=`echo $TRAVIS_TAG | sed "s/-/\\./g"`
- cd packaging - cd packaging
- mkdir build - mkdir build
- ./package-all.sh $TRAVIS_TAG build - ./package-all.sh $TRAVIS_TAG $PWD/build/
deploy: deploy:
provider: releases provider: releases
api_key: api_key:
@@ -50,6 +51,6 @@ deploy:
- build/openra_$DOTVERSION_all.deb - build/openra_$DOTVERSION_all.deb
skip_cleanup: true skip_cleanup: true
on: on:
all_branches: true all_branches: false
tags: true tags: true
repo: OpenRA/OpenRA repo: OpenRA/OpenRA

8
packaging/linux/buildpackage.sh
View File

@@ -40,7 +40,7 @@ cd packaging/linux
pushd deb pushd deb
echo "Building Debian package." echo "Building Debian package."
./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Debian package build failed." echo "Debian package build failed."
fi fi
@@ -48,7 +48,7 @@ popd
pushd pkgbuild pushd pkgbuild
echo "Building Arch-Linux package." echo "Building Arch-Linux package."
sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Arch-Linux package build failed." echo "Arch-Linux package build failed."
fi fi
@@ -56,11 +56,9 @@ popd
pushd rpm pushd rpm
echo "Building RPM package." echo "Building RPM package."
sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" bash buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "RPM package build failed." echo "RPM package build failed."
fi fi
popd popd
wait

2
packaging/linux/rpm/buildpackage.sh
View File

@@ -6,6 +6,8 @@ then
exit $E_BADARGS exit $E_BADARGS
fi fi
mkdir ~/rpmbuild/
# Replace any dashes in the version string with periods # Replace any dashes in the version string with periods
PKGVERSION=`echo $1 | sed "s/-/\\./g"` PKGVERSION=`echo $1 | sed "s/-/\\./g"`

4
packaging/package-all.sh
View File

@@ -89,7 +89,7 @@ popd
pushd osx pushd osx
echo "Zipping OS X package" echo "Zipping OS X package"
sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR" bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "OS X package build failed." echo "OS X package build failed."
fi fi
@@ -97,7 +97,7 @@ popd
pushd linux pushd linux
echo "Building Linux packages" echo "Building Linux packages"
sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR" bash buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Linux package build failed." echo "Linux package build failed."
fi fi