sven/ulogger-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add npm to travis build

Browse Source
This commit is contained in:
Bartek Fabiszewski 2020-01-07 22:56:37 +01:00
parent 5f852b419b
commit 4072191170
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.docker/init.sh
View File

@ -49,12 +49,12 @@ else
mysqld_safe --datadir=/data & mysqld_safe --datadir=/data &
mysqladmin --silent --wait=30 ping mysqladmin --silent --wait=30 ping
mysqladmin -u root password "${DB_ROOT_PASS}" mysqladmin -u root password "${DB_ROOT_PASS}"
mysql -u root -p${DB_ROOT_PASS} < /var/www/html/scripts/ulogger.sql mysql -u root -p"${DB_ROOT_PASS}" < /var/www/html/scripts/ulogger.sql
mysql -u root -p${DB_ROOT_PASS} -e "CREATE USER 'ulogger'@'localhost' IDENTIFIED BY '${DB_USER_PASS}'" mysql -u root -p"${DB_ROOT_PASS}" -e "CREATE USER 'ulogger'@'localhost' IDENTIFIED BY '${DB_USER_PASS}'"
mysql -u root -p${DB_ROOT_PASS} -e "GRANT ALL PRIVILEGES ON ulogger.* TO 'ulogger'@'localhost'" mysql -u root -p"${DB_ROOT_PASS}" -e "GRANT ALL PRIVILEGES ON ulogger.* TO 'ulogger'@'localhost'"
mysql -u root -p${DB_ROOT_PASS} -e "CREATE USER 'ulogger'@'%' IDENTIFIED BY '${DB_USER_PASS}'" mysql -u root -p"${DB_ROOT_PASS}" -e "CREATE USER 'ulogger'@'%' IDENTIFIED BY '${DB_USER_PASS}'"
mysql -u root -p${DB_ROOT_PASS} -e "GRANT ALL PRIVILEGES ON ulogger.* TO 'ulogger'@'%'" mysql -u root -p"${DB_ROOT_PASS}" -e "GRANT ALL PRIVILEGES ON ulogger.* TO 'ulogger'@'%'"
mysql -u root -p${DB_ROOT_PASS} -e "INSERT INTO users (login, password) VALUES ('admin', '\$2y\$10\$7OvZrKgonVZM9lkzrTbiou.CVhO3HjPk5y0W9L68fVwPs/osBRIMq')" ulogger mysql -u root -p"${DB_ROOT_PASS}" -e "INSERT INTO users (login, password) VALUES ('admin', '\$2y\$10\$7OvZrKgonVZM9lkzrTbiou.CVhO3HjPk5y0W9L68fVwPs/osBRIMq')" ulogger
mysqladmin -u root -p${DB_ROOT_PASS} shutdown mysqladmin -u root -p"${DB_ROOT_PASS}" shutdown
sed -i "s/^\$dbdsn = .*$/\$dbdsn = \"mysql:host=localhost;port=3306;dbname=ulogger;charset=utf8\";/" /var/www/html/config.php sed -i "s/^\$dbdsn = .*$/\$dbdsn = \"mysql:host=localhost;port=3306;dbname=ulogger;charset=utf8\";/" /var/www/html/config.php
fi fi

3
.tests/tests/ClientAPITest.php
View File

@ -333,8 +333,7 @@ class ClientAPITest extends UloggerAPITestCase {
"bearing" => $this->testBearing, "bearing" => $this->testBearing,
"accuracy" => $this->testAccuracy, "accuracy" => $this->testAccuracy,
"provider" => $this->testProvider, "provider" => $this->testProvider,
"comment" => $this->testComment, "comment" => $this->testComment
"image" => null
]; ];
$actual = $this->getConnection()->createQueryTable( $actual = $this->getConnection()->createQueryTable(
"positions", "positions",

4
.travis.yml
View File

@ -43,6 +43,7 @@ before_install:
;; ;;
esac esac
- composer install - composer install
- npm install
- until netstat -atn 2>/dev/null | grep '8080.*LISTEN'; do sleep 1; done - until netstat -atn 2>/dev/null | grep '8080.*LISTEN'; do sleep 1; done
after_success: after_success:
@ -58,7 +59,8 @@ after_success:
script: script:
- ./vendor/bin/phpunit -c .tests/phpunit.xml - ./vendor/bin/phpunit -c .tests/phpunit.xml || docker logs ulogger
- npm test
addons: addons:
coverity_scan: coverity_scan: