PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TravisCI: re-enable coverage, exclude WorldSessionActor

Browse source 
* Update badge to travis-ci.com
* Add artifact upload to S3 testing for future CI based server deploys
This commit is contained in:
Chord 2019-12-13 13:48:15 -05:00
parent 6a0c2a6955
commit bf21491859
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.travis.yml
View file

@ -5,9 +5,8 @@ dist: trusty
scala: scala:
- 2.11.8 - 2.11.8
env: env:
- SBT_COMMAND="test:compile test" - SBT_COMMAND="test:compile test packArchiveZip"
# TODO(chord): uncomment when WorldSessionActor is refactored - SBT_COMMAND="coverage test:compile test coverageReport"
#- SBT_COMMAND="coverage test:compile test coverageReport"
cache: cache:
directories: directories:
@ -17,7 +16,7 @@ before_cache:
- rm -fv $HOME/.ivy2/.sbt.ivy.lock - rm -fv $HOME/.ivy2/.sbt.ivy.lock
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
- find $HOME/.sbt -name "*.lock" -print -delete - find $HOME/.sbt -name "*.lock" -print -delete
before_script: before_script:
- wget https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip - wget https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip
- unzip pscrypto-lib-1.1.zip - unzip pscrypto-lib-1.1.zip
@ -25,3 +24,8 @@ script:
- sbt ++$TRAVIS_SCALA_VERSION $SBT_COMMAND - sbt ++$TRAVIS_SCALA_VERSION $SBT_COMMAND
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
addons:
artifacts: true
paths:
- $(ls target/pslogin*.zip | tr "\n" ":")

2
README.md
View file

@ -1,4 +1,4 @@
# PlanetSide Login Server [![Build Status](https://travis-ci.org/psforever/PSF-LoginServer.svg?branch=master)](https://travis-ci.org/psforever/PSF-LoginServer) [![Code coverage](https://codecov.io/gh/psforever/PSF-LoginServer/coverage.svg?branch=master)](https://codecov.io/gh/psforever/PSF-LoginServer/) [![Documentation](https://img.shields.io/badge/documentation-master-lightgrey)](https://psforever.github.io/docs/master/index.html) # PlanetSide Login Server [![Build Status](https://travis-ci.org/psforever/PSF-LoginServer.svg?branch=master)](https://travis-ci.com/psforever/PSF-LoginServer) [![Code coverage](https://codecov.io/gh/psforever/PSF-LoginServer/coverage.svg?branch=master)](https://codecov.io/gh/psforever/PSF-LoginServer/) [![Documentation](https://img.shields.io/badge/documentation-master-lightgrey)](https://psforever.github.io/docs/master/index.html)
This project contains the code to run and manage the login and world server roles for PlanetSide 1. This project contains the code to run and manage the login and world server roles for PlanetSide 1.
The login server and world server are currently combined for ease of contributing. The login server and world server are currently combined for ease of contributing.

4
build.sbt
View file

@ -64,7 +64,9 @@ lazy val pslogin = (project in file("pslogin")).
settings( settings(
name := "pslogin", name := "pslogin",
// ActorTests have specific timing requirements and will be flaky if run in parallel // ActorTests have specific timing requirements and will be flaky if run in parallel
parallelExecution in Test := false parallelExecution in Test := false,
// TODO(chord): remove exclusion when WorldSessionActor is refactored: https://github.com/psforever/PSF-LoginServer/issues/279
coverageExcludedPackages := "WorldSessionActor.*;zonemaps.*"
). ).
settings(pscryptoSettings: _*). settings(pscryptoSettings: _*).
dependsOn(common) dependsOn(common)