通过
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 bb53c29 Merge branch 'master' of http://114.215.101.231:8099/lihan/integral into juan
From http://114.215.101.231:8099/lihan/integral
5cdd011..771f3a0 master -> origin/master
Checking out 771f3a03 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/integral
$ git pull
From http://114.215.101.231:8099/lihan/integral
5cdd011..771f3a0 master -> origin/master
Auto-merging public/themes/simpleboot3/cart/zj_cart/order_confirm.html
Merge made by the 'recursive' strategy.
.../simpleboot3/cart/zj_cart/order_confirm.html | 39 +++++++++++++---------
.../themes/simpleboot3/user/center/edit_phone.html | 1 -
2 files changed, 23 insertions(+), 17 deletions(-)
Build succeeded