Skip to content

Commit

Permalink
Merge pull request NVIDIA#1227 from lukeyeager/travis-to-ppa
Browse files Browse the repository at this point in the history
[Packaging] Separate builds for trusty/xenial on TravisCI
  • Loading branch information
lukeyeager authored Oct 28, 2016
2 parents a989aa1 + 2d3eb8c commit 0daa0ab
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 3 deletions.
3 changes: 1 addition & 2 deletions packaging/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ RUN apt-get update \
lintian \
&& rm -rf /var/lib/apt/lists/*

ENV DEBFULLNAME "NVIDIA CORPORATION"
ENV DEBFULLNAME "DIGITS Development Team"
ENV DEBEMAIL "[email protected]"
ENV DEB_BUILD_OPTIONS nocheck

ARG UPSTREAM_VERSION
ARG DEBIAN_VERSION
Expand Down
2 changes: 2 additions & 0 deletions packaging/deb/templates/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
%:
dh $@ --parallel --with=python2,systemd --buildsystem=pybuild

override_dh_auto_test:
:
37 changes: 36 additions & 1 deletion scripts/travis/deb-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,40 @@ ROOT_DIR=$( dirname "$(dirname "$LOCAL_DIR")")
set -x

git fetch --tags
$ROOT_DIR/packaging/deb/build.sh
cd $ROOT_DIR/packaging/deb

DEBIAN_REVISION=1ppa1~trusty ./build.sh
DEBIAN_REVISION=1ppa1~xenial ./build.sh

if [ "$TRAVIS" != "true" ]; then
echo "Skipping PPA uploads for non-Travis build."
exit 0
fi
if [ "$TRAVIS_REPO_SLUG" != "NVIDIA/DIGITS" ]; then
echo "Skipping PPA uploads for non-DIGITS fork build."
exit 0
fi
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo "Skipping PPA uploads for pull request build."
exit 0
fi
if [ -n "$TRAVIS_TAG" ]; then
PPA_NAME=stable
elif [ "$TRAVIS_BRANCH" == "master" ]; then
PPA_NAME=dev
else
echo "Skipping PPA uploads for non-master branch build"
exit 0
fi

echo "Uploading to \"$PPA_NAME\" PPA ..."

pushd .
cd dist/*trusty
find .
popd

pushd .
cd dist/*xenial
find .
popd

0 comments on commit 0daa0ab

Please sign in to comment.