diff --git a/.travis.yml b/.travis.yml index c53baef43..1e6ca033b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,27 +59,26 @@ script: - cp -f env.ini-travis env.ini - composer update - ls - - chmod +x /home/travis/build/gopeak/masterlab/travis/install-nginx.sh - - /home/travis/build/gopeak/masterlab/travis/install-nginx.sh - - chown -R $(whoami):$(whoami) /home/travis/build/gopeak/masterlab/app/storage - - chmod +x /home/travis/build/gopeak/masterlab/app/storage - - curl "http://travis.test:8888/framework/feature/getPhpIni?data_type=json" + - chmod +x $TRAVIS_BUILD_DIR/travis/install-nginx.sh + - $TRAVIS_BUILD_DIR/travis/install-nginx.sh + - chown -R $(whoami):$(whoami) $TRAVIS_BUILD_DIR/app/storage + - chmod +x $TRAVIS_BUILD_DIR/app/storage + - curl "http://masterlab.ci:8888/framework/feature/getPhpIni?data_type=json" - cat /tmp/error.log - php app/public/test_mysql.php - cd app/test - phpunit #--bootstrap ./bootstrap.php requirement/TestEnv.php - # - cat /tmp/error.log + # - cat /tmp/error.log notifications: email: - 121642038@qq.com addons: - ssh_known_hosts: 47.244.62.11 + #ssh_known_hosts: 47.244.62.11 hosts: - - travis.test - - masterlab.dev + - masterlab.ci apt: sources: - mysql-5.7-trusty diff --git a/app/config/travis/app.cfg.php b/app/config/travis/app.cfg.php index ef5971259..c70069def 100644 --- a/app/config/travis/app.cfg.php +++ b/app/config/travis/app.cfg.php @@ -4,7 +4,7 @@ error_reporting(E_ALL); // URL手动设置 -define('ROOT_URL', 'http://travis.test:8888/'); +define('ROOT_URL', 'http://masterlab.ci:8888/'); // 附件地址 define('ATTACHMENT_URL', ROOT_URL . 'attachment/'); diff --git a/travis/default-site.tpl.conf b/travis/default-site.tpl.conf index ab50e7df4..2b4082527 100644 --- a/travis/default-site.tpl.conf +++ b/travis/default-site.tpl.conf @@ -1,9 +1,9 @@ server { listen 8888; #listen [::]:8080 default_server ipv6only=on; - server_name travis.test; + server_name masterlab.ci; - root /home/travis/build/gopeak/masterlab/app/public; + root {ROOT}/app/public; access_log /tmp/access.log; error_log /tmp/error.log; @@ -32,7 +32,7 @@ server { } location ^~ /attachment/ { - root /home/travis/build/gopeak/masterlab/app/storage/; + root {ROOT}/app/storage/; } location ~ \.php {