diff --git a/.travis.yml b/.travis.yml index 17fb42538..86d8406e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,12 +32,17 @@ before_cache: jobs: include: - - stage: "Verify" - script: sbt ++$TRAVIS_SCALA_VERSION ";validate-api; validate-core; verify-api" + - stage: "Verify core and API modules" + script: sbt ++$TRAVIS_SCALA_VERSION ";validate-api; validate-core" name: "Validate and verify API" - script: ./bin/func-test-api-travis.sh name: "Run API functional tests" - - script: sbt ++$TRAVIS_SCALA_VERSION ";validate-portal; verify-portal" - name: "Validate and verify portal" + - script: sbt ++$TRAVIS_SCALA_VERSION "validate-portal" + name: "Validate portal" - script: ./bin/func-test-portal.sh name: "Run portal functional tests" + - script: sbt ++$TRAVIS_SCALA_VERSION "verify" + name: "Verify and run coverage on API and portal" + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/build.sbt b/build.sbt index 26c15202e..35b5d5dcd 100644 --- a/build.sbt +++ b/build.sbt @@ -296,6 +296,8 @@ lazy val docSettings = Seq( Map("title" -> "Contributing", "section" -> "contributing", "position" -> "2") ) ), + micrositePushSiteWith := GitHub4s, + micrositeGithubToken := sys.env.get("SBT_MICROSITES_PUBLISH_TOKEN"), ghpagesNoJekyll := false, fork in tut := true ) @@ -314,8 +316,6 @@ addCommandAlias("validate-portal", addCommandAlias("validate", ";validate-core;validate-api;validate-portal") // Verify runs all tests and code coverage -addCommandAlias("verify-api", ";project api; dockerComposeUp; test; it:test; dockerComposeStop") -addCommandAlias("verify-portal", ";project portal; test") addCommandAlias("verify", ";project api;dockerComposeUp;project root;coverage;test;it:test;coverageReport;coverageAggregate;project api;dockerComposeStop") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 52322ba73..fa75a741d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -48,7 +48,8 @@ object Dependencies { "io.prometheus" % "simpleclient_dropwizard" % prometheusV, "io.prometheus" % "simpleclient_common" % prometheusV, "com.typesafe" % "config" % configV, - "org.typelevel" %% "cats-effect" % catsEffectV + "org.typelevel" %% "cats-effect" % catsEffectV, + "com.47deg" %% "github4s" % "0.18.6" ) lazy val coreDependencies = Seq(