mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-09-03 07:45:15 +00:00
Code Issues Releases Wiki Activity

Get portal and API build to run (except API func/integration tests)

Browse Source
This commit is contained in:
Michael Ly
2018-07-30 15:00:42 -04:00
parent 1a8fb505da
commit 68dcde94e3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@@ -13,7 +13,8 @@ cache:
directories: directories:
- $HOME/.ivy2/cache - $HOME/.ivy2/cache
- $HOME/.sbt - $HOME/.sbt
- $HOME/.protobuf-2.6.1/src
install: install:
- wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz - wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
- tar -xzvf protobuf-2.6.1.tar.gz - tar -xzvf protobuf-2.6.1.tar.gz
@@ -27,10 +28,9 @@ before_cache:
jobs: jobs:
include: include:
- stage: "Verify" - stage: "Verify"
script: sbt ++$TRAVIS_SCALA_VERSION ";validate;" script: sbt ++$TRAVIS_SCALA_VERSION ";validate-api; validate-core; verify-api"
script: sbt ++$TRAVIS_SCALA_VERSION ";verify;" name: "Validate and verify API"
script: ./bin/func-test-api.sh # run func tests in parallel - script: sbt ++$TRAVIS_SCALA_VERSION ";validate-portal; verify-portal"
name: "Validate and verify portal"
- script: ./bin/func-test-portal.sh
script: name: "Run portal functional tests"
- sbt ++$TRAVIS_SCALA_VERSION ";validate;verify"

4
build.sbt
View File

@@ -288,6 +288,8 @@ addCommandAlias("validate-portal",
addCommandAlias("validate", ";validate-core;validate-api;validate-portal") addCommandAlias("validate", ";validate-core;validate-api;validate-portal")
// Verify runs all tests and code coverage // Verify runs all tests and code coverage
addCommandAlias("verify-api", ";project api; test")
addCommandAlias("verify-portal", ";project portal; test")
addCommandAlias("verify", addCommandAlias("verify",
";project api;dockerComposeUp;project root;coverage;test;it:test;coverageReport;coverageAggregate;project api;dockerComposeStop") ";project api;dockerComposeUp;project root;coverage;test;it:test;coverageReport;coverageAggregate;project api;dockerComposeStop")
@@ -295,5 +297,3 @@ addCommandAlias("verify",
addCommandAlias("build-api", ";project api;clean;assembly") addCommandAlias("build-api", ";project api;clean;assembly")
addCommandAlias("build-portal", ";project portal;clean;preparePortal;dist") addCommandAlias("build-portal", ";project portal;clean;preparePortal;dist")
addCommandAlias("build", ";build-api;build-portal") addCommandAlias("build", ";build-api;build-portal")