This commit is contained in:
Kreyren 2020-02-09 17:58:46 +00:00
parent 9d2fdb1797
commit 1ed8f68e66
4 changed files with 37 additions and 6 deletions

@ -220,4 +220,5 @@ install:
- QA/travis-ci/install.sh
script:
- QA/travis-ci/test.sh
#- QA/travis-ci/test.sh
- QA/travis-ci/build.sh

@ -23,6 +23,6 @@ zernit-logger = { path = "src/libs/rustlang/zernit-logger" }
# Used for benchmarking
criterion = "0.3.1"
[[bench]]
name = "example_bench"
harness = false
# [[bench]]
# name = "example_bench"
# harness = false

30
QA/travis-ci/build.sh Executable file

@ -0,0 +1,30 @@
#!/usr/bin/env bash
# Copyright 2019 Jacob Hrbek <kreyren@rixotstudio.cz>
# Distributed under the terms of the GNU General Public License v3 (https://www.gnu.org/licenses/gpl-3.0.en.html) or later
# shellcheck source=QA/travis-ci/travis-common.sh
. "QA/travis-ci/travis-common.sh"
# shellcheck source=QA/travis-ci/get-container.sh
. "QA/travis-ci/get-container.sh"
# Linux as-is
if [ "$TRAVIS_OS_NAME" = linux ] && [ -z "$DOCKER" ] && [ -z "$QEMU" ]; then
make build-rustlang
# Linux via Docker
elif [ "$TRAVIS_OS_NAME" = linux ] && [ -n "$DOCKER" ] && [ -z "$QEMU" ]; then
sudo docker exec "$CONTAINER" make --directory="/travis/Zernit" build-rustlang
# MacOS X
elif [ "$TRAVIS_OS_NAME" = osx ]; then
make --directory="/Users/travis/build/Kreyrock/Kreyrock" check
elif [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$QEMU" = "FreeBSD" ]; then
ssh -p 8829 -oStrictHostKeyChecking=no -i "$HOME/.ssh/id_rsa" root@localhost \
make check
else
die "Invalid setting of TRAVIS_OS_NAME=$TRAVIS_OS_NAME, DOCKER=$DOCKER, QEMU=$QEMU!"
fi

@ -10,11 +10,11 @@
# Linux as-is
if [ "$TRAVIS_OS_NAME" = linux ] && [ -z "$DOCKER" ] && [ -z "$QEMU" ]; then
make build-rustlang
make test-rustlang
# Linux via Docker
elif [ "$TRAVIS_OS_NAME" = linux ] && [ -n "$DOCKER" ] && [ -z "$QEMU" ]; then
sudo docker exec "$CONTAINER" make --directory="/travis/Zernit" build-rustlang
sudo docker exec "$CONTAINER" make --directory="/travis/Zernit" test-rustlang
# MacOS X
elif [ "$TRAVIS_OS_NAME" = osx ]; then