MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2252 from cclauss/patch-2 

Replace $IS_TRAVIS with builtin $CI
pull/2336/head
Åke 2019-09-26 16:42:51 +02:00 committed by GitHub
parent bf38812ddf a77216714d
commit 9cff2b8b0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -18,7 +18,9 @@ python:
- "3.6" - "3.6"
- "3.7" - "3.7"
# don't rebuild pocketsphinx for every build # don't rebuild pocketsphinx for every build
cache: pocketsphinx-python cache:
- pip
- pocketsphinx-python
# command to install dependencies # command to install dependencies
install: install:
- rm -rf ${TMPDIR} - rm -rf ${TMPDIR}
@ -31,8 +33,6 @@ install:
script: script:
- pycodestyle mycroft test - pycodestyle mycroft test
- ./start-mycroft.sh unittest - ./start-mycroft.sh unittest
env:
- IS_TRAVIS=true
after_success: after_success:
coveralls coveralls

4
dev_setup.sh
View File

@ -128,7 +128,7 @@ if found_exe tput ; then
fi fi
# Run a setup wizard the very first time that guides the user through some decisions # Run a setup wizard the very first time that guides the user through some decisions
if [[ ! -f .dev_opts.json && -z $IS_TRAVIS ]] ; then if [[ ! -f .dev_opts.json && -z $CI ]] ; then
echo " echo "
$CYAN Welcome to Mycroft! $RESET" $CYAN Welcome to Mycroft! $RESET"
sleep 0.5 sleep 0.5
@ -298,7 +298,7 @@ function install_deps() {
elif os_is_like debian || os_is debian || os_is_like ubuntu || os_is ubuntu || os_is linuxmint; then elif os_is_like debian || os_is debian || os_is_like ubuntu || os_is ubuntu || os_is linuxmint; then
# Debian / Ubuntu / Mint # Debian / Ubuntu / Mint
echo "$GREEN Installing packages for Debian/Ubuntu/Mint...$RESET" echo "$GREEN Installing packages for Debian/Ubuntu/Mint...$RESET"
if dpkg -V libjack-jackd2-0 > /dev/null 2>&1 && [[ -z $IS_TRAVIS ]] ; then if dpkg -V libjack-jackd2-0 > /dev/null 2>&1 && [[ -z ${CI} ]] ; then
echo " echo "
We have detected that your computer has the libjack-jackd2-0 package installed. We have detected that your computer has the libjack-jackd2-0 package installed.
Mycroft requires a conflicting package, and will likely uninstall this package. Mycroft requires a conflicting package, and will likely uninstall this package.

2
scripts/prepare-msm.sh
View File

@ -47,7 +47,7 @@ function change_ownership {
} }
if [[ ${IS_TRAVIS} != true ]] ; then if [[ ${CI} != true ]] ; then
if [ ! -d ${skills_dir} ] ; then if [ ! -d ${skills_dir} ] ; then
echo "Create ${skills_dir}" echo "Create ${skills_dir}"
$SUDO mkdir -p ${skills_dir} $SUDO mkdir -p ${skills_dir}