通过
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 5721b55 增加底部图片样式
From http://114.215.101.231:8099/root/liepin
5721b55..ac7080f master -> origin/master
Checking out ac7080ff as master...
Skipping Git submodules setup
$ cd /alidata/www/online/chinacrossing.cn
$ git pull
From http://114.215.101.231:8099/root/liepin
5721b55..ac7080f master -> origin/master
Auto-merging public/assets/css/news.css
Merge made by the 'recursive' strategy.
application/index/controller/Index.php | 43 ++++++-
application/index/view/index/about.html | 4 +-
application/index/view/index/business.html | 4 +-
application/index/view/index/contact.html | 4 +-
application/index/view/index/course.html | 7 +-
application/index/view/index/index.html | 4 +-
application/index/view/index/news.html | 6 +-
application/index/view/index/news_detail.html | 167 +++++++++++++-------------
public/assets/css/news.css | 10 ++
9 files changed, 155 insertions(+), 94 deletions(-)
Build succeeded