Skip to content

Commit

Permalink
passed .travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
weichaoduo committed Nov 16, 2018
1 parent dc84fe3 commit 2587426
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- [email protected]

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
Expand Down
2 changes: 1 addition & 1 deletion app/config/travis/app.cfg.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/');
Expand Down
6 changes: 3 additions & 3 deletions travis/default-site.tpl.conf
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -32,7 +32,7 @@ server {
}

location ^~ /attachment/ {
root /home/travis/build/gopeak/masterlab/app/storage/;
root {ROOT}/app/storage/;
}

location ~ \.php {
Expand Down

0 comments on commit 2587426

Please sign in to comment.