Skip to content

Commit 58e5a93

Browse files
committed
Merge branch 'develop'
Former-commit-id: 18270e126afbf3bda2d3e3c2e8dc1132cbb2e85c [formerly dd95dd33a38889604f53ecfd9260e3899bc3b102] [formerly 9f86f1e332974459cabf304f0856d7fd506028a7 [formerly 24ba363152e7bbc35d86ee478a1d3a802977a308]] Former-commit-id: 9b2e168db12bc3a32e26ea956faa0445cc668b93 [formerly dcc17948d6faef65373dac53ee425d76be122ae4] Former-commit-id: 639af30a6fadb0caff3fea1e85a782272a8e0a45
2 parents f654f53 + 893ecb1 commit 58e5a93

File tree

242 files changed

+19126
-28435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+19126
-28435
lines changed

.travis.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
sudo: false
22
language: cpp
33

4+
env:
5+
global:
6+
- LANG="en_US.UTF-8"
7+
- COVERAGE=false
8+
49
compiler:
510
- gcc
611

@@ -16,7 +21,12 @@ addons:
1621
#- g++-4.9
1722
- cmake-data
1823
- cmake
19-
24+
- lcov
25+
#sonarcloud
26+
sonarcloud:
27+
organization: "ark-game"
28+
token:
29+
secure: "ddzOfx+RRNCBteyQbwhTzB/r/gj8dTeTNOu5V9+4cAhMyaUoGzRMe2QYdknid/ichhNJ4eOcwAnmhil7XR1cIobpL52r05WL/+SYogy3U2cXAS9K4y/7To38GxdRXSx9mk0VTWjRW8A8wwVGOteOAuieW0jbXivgxUrGZEybqinzNj9ndLJ1iPapihVWQFy7GmQC3gIkLVLLa1d/ueYiilMOvIsbWjGdVFm3pyNXq2TUQurYuxYAVCYv9BTlj0EeyVHjKcL+OcMDJGSd8rUlLKl/HueM9pBXNi4w3zlVBZpccpJxYbXezf/DDSO7zJlYkBAZ+x6fzGFILVjvEhvdotz49f03/orJa3ofw+oOGYZn8wKQ0DnWSEva39+kLZsqMC+hEMbxcnc/4hUGmFia5HWYdjX3lTiWBGU8H+nhuVQ4XlJaBsN7fUCgfQFDiz0GrwwvXNxHkh2w484oYXVBCHi+T8Fxjmy7JetwkVf2UbCQ+g921peaQr+LeGno0VviJRSqvINlRaMqEu+1+X2/njee9VAQmkXe18bMOzrZjmSHZct5hAIjGNDl67gmZqQ7afI33+rQ7sG32v7jWp66hilYbDVgFnsYVCZKZqtDx/EDL22awKg+zMSrokORwcWIZVAe6R4LEJcUtiOIkpkqqZ7b8a5L2vOc0G0p4GBktR0="
2030
before_install:
2131
# run build_dep.sh
2232
- pwd
@@ -25,16 +35,24 @@ before_install:
2535
- ./build_dep.sh
2636
- cd ..
2737

38+
install:
39+
#- sudo pip install --upgrade pip
40+
#- sudo pip install codecov
41+
2842
before_script:
2943
# cmake
3044
- if [-d "build" ]; then rm -rf build; fi
3145
- mkdir build && cd build
32-
- cmake -G "Unix Makefiles" ..
46+
- cmake -G "Unix Makefiles" -DENABLE_COVERAGE=ON ..
3347

3448
script:
3549
# make
3650
- make -j 8
37-
38-
env:
39-
global:
40-
- LANG="en_US.UTF-8"
51+
52+
after_success:
53+
#- bash <(curl -s https://codecov.io/bash)
54+
55+
notifications:
56+
email:
57+
- nickyang1988@qq.com
58+
- 410274624@qq.com

Bin/Examples/Debug/log/.gitignore

Whitespace-only changes.

Bin/Examples/Release/log/.gitignore

Whitespace-only changes.

Bin/Server/Debug/AFGameServer/log.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFGameServer/log_win.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFLoginServer/log.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFLoginServer/log_win.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFMasterServer/log.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFMasterServer/log_win.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

Bin/Server/Debug/AFProxyServer/log.conf

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)