Update travis

This commit is contained in:
Konstantinos Sideris 2017-12-31 13:19:32 +02:00
parent 0efe6c7db4
commit 1a3369877e
6 changed files with 25 additions and 35 deletions

View file

@ -7,10 +7,6 @@
DIR=package.dir DIR=package.dir
TAG=`git tag -l --points-at HEAD` TAG=`git tag -l --points-at HEAD`
if [ -z "$TAG" ]; then
exit 0
fi
# Installing dependencies on travis. # Installing dependencies on travis.
if [ ! -z "$TRAVIS_OS_NAME" ]; then if [ ! -z "$TRAVIS_OS_NAME" ]; then
sudo apt-add-repository -y ppa:brightbox/ruby-ng sudo apt-add-repository -y ppa:brightbox/ruby-ng

View file

@ -6,10 +6,6 @@ APP=nheko
DIR=${APP}.AppDir DIR=${APP}.AppDir
TAG=`git tag -l --points-at HEAD` TAG=`git tag -l --points-at HEAD`
if [ -z "$TAG" ]; then
exit 0
fi
# Set up AppImage structure. # Set up AppImage structure.
mkdir -p ${DIR}/usr/{bin,share/pixmaps,share/applications} mkdir -p ${DIR}/usr/{bin,share/pixmaps,share/applications}

View file

@ -4,10 +4,6 @@ set -e
TAG=`git tag -l --points-at HEAD` TAG=`git tag -l --points-at HEAD`
if [ -z "$TAG" ]; then
exit 0
fi
# Add Qt binaries to path # Add Qt binaries to path
PATH=/usr/local/opt/qt/bin/:${PATH} PATH=/usr/local/opt/qt/bin/:${PATH}

View file

@ -50,9 +50,8 @@ before_script:
script: script:
- make ci - make ci
- if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi - if [ $TRAVIS_OS_NAME == osx ]; then make lint; fi
- if [ $TRAVIS_OS_NAME == osx ] && [ $DEPLOYMENT == 1 ]; then ./.ci/macos/deploy.sh; fi - if [ $TRAVIS_OS_NAME == osx ] && [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then make macos-deploy; fi
- if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ]; then ./.ci/linux/deploy.sh; fi - if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ] && [ ! -z $TRAVIS_TAG ]; then make linux-deploy; fi
- if [ $TRAVIS_OS_NAME == linux ] && [ $DEPLOYMENT == 1 ]; then ./.ci/linux/create-packages.sh; fi
before_deploy: before_deploy:
- export RELEASE_DEB_FILE=$(ls *.deb) - export RELEASE_DEB_FILE=$(ls *.deb)

View file

@ -11,27 +11,25 @@ release:
@cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo @cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo
@cmake --build build @cmake --build build
linux-appimage:
@./.ci/linux/deploy.sh
linux-install: linux-install:
cp -f nheko*.AppImage ~/.local/bin cp -f nheko*.AppImage ~/.local/bin
macos-app: release
@./.ci/macos/deploy.sh
macos-app-install: macos-app-install:
cp -Rf build/nheko.app /Applications cp -Rf build/nheko.app /Applications
run:
@./build/nheko
lint: lint:
@./.ci/format.sh ./.ci/format.sh
image: image:
docker build -t nheko-app-image . docker build -t nheko-app-image .
linux-deploy:
./.ci/linux/deploy.sh
./.ci/linux/create-packages.sh
macos-deploy:
./.ci/macos/deploy.sh
docker-app-image: image docker-app-image: image
docker run \ docker run \
-e CXX=g++-7 \ -e CXX=g++-7 \
@ -39,16 +37,7 @@ docker-app-image: image
-v `pwd`:/build nheko-app-image make release -v `pwd`:/build nheko-app-image make release
docker run \ docker run \
--privileged \ --privileged \
-v `pwd`:/build nheko-app-image make linux-appimage -v `pwd`:/build nheko-app-image make linux-deploy
docker-packages: image
docker run \
-e CXX=g++-7 \
-e CC=gcc-7 \
-v `pwd`:/build nheko-app-image make release
docker run \
--privileged \
-v `pwd`:/build nheko-app-image ./.ci/linux/create-packages.sh
clean: clean:
rm -rf build rm -rf build

14
scripts/archive.sh Executable file
View file

@ -0,0 +1,14 @@
#!/bin/bash -e
TAG=`git tag -l --points-at HEAD`
PREFIX=$(basename "$(pwd -P)")
if [ ! -z $TAG ]; then
PREFIX=$(basename "$(pwd -P)").$TAG
fi
{
git ls-files
git submodule foreach --recursive --quiet \
'git ls-files --with-tree="$sha1" | sed "s#^#$path/#"'
} | sed "s#^#$PREFIX/#" | xargs tar -c -C.. -f "$PREFIX.tar.bz2" --