diff --git a/.travis.yml b/.travis.yml index 448e0e274..55aa40495 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,8 @@ dist: trusty scala: - 2.11.8 env: - - SBT_COMMAND="test:compile test" - # TODO(chord): uncomment when WorldSessionActor is refactored - #- SBT_COMMAND="coverage test:compile test coverageReport" + - SBT_COMMAND="test:compile test packArchiveZip" + - SBT_COMMAND="coverage test:compile test coverageReport" cache: directories: @@ -17,7 +16,7 @@ before_cache: - rm -fv $HOME/.ivy2/.sbt.ivy.lock - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete - find $HOME/.sbt -name "*.lock" -print -delete - + before_script: - wget https://github.com/psforever/PSCrypto/releases/download/v1.1/pscrypto-lib-1.1.zip - unzip pscrypto-lib-1.1.zip @@ -25,3 +24,8 @@ script: - sbt ++$TRAVIS_SCALA_VERSION $SBT_COMMAND after_success: - bash <(curl -s https://codecov.io/bash) + +addons: + artifacts: true + paths: + - $(ls target/pslogin*.zip | tr "\n" ":") diff --git a/README.md b/README.md index f4b4e1d5b..8b04af9b4 100644 --- a/README.md +++ b/README.md @@ -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. The login server and world server are currently combined for ease of contributing. diff --git a/build.sbt b/build.sbt index ae05bdf40..8b7f7ebd5 100644 --- a/build.sbt +++ b/build.sbt @@ -64,7 +64,9 @@ lazy val pslogin = (project in file("pslogin")). settings( name := "pslogin", // 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: _*). dependsOn(common)