From d6df28c254d1365bf7e6841be9dee33f9150dd0c Mon Sep 17 00:00:00 2001 From: Gabe Conradi Date: Thu, 22 Jun 2017 21:57:54 +0200 Subject: [PATCH 1/2] fix getLshwValues duplicate breaking build --- app/collins/models/AssetMeta.scala | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/collins/models/AssetMeta.scala b/app/collins/models/AssetMeta.scala index c5a4e3921..8ccd6921e 100644 --- a/app/collins/models/AssetMeta.scala +++ b/app/collins/models/AssetMeta.scala @@ -216,9 +216,5 @@ object AssetMeta extends Schema with AnormAdapter[AssetMeta] with AssetMetaKeys def getLshwValues(): Set[AssetMeta] = { Set(BaseDescription, BaseProduct, BaseVendor, BaseSerial, GpuProduct, GpuVendor) } - - def getLshwValues(): Set[AssetMeta] = { - Set(BaseDescription, BaseProduct, BaseVendor, BaseSerial) - } } } From 2c9ba929165f30766b6b9f9f9ebdce94843b3754 Mon Sep 17 00:00:00 2001 From: Gabe Conradi Date: Thu, 22 Jun 2017 22:00:42 +0200 Subject: [PATCH 2/2] make sure to run scala tests --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index f111846f8..50773e948 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,9 @@ env: - RUN_SCALA=true RUN_RUBY=false matrix: include: + # make sure we run the scala builds + - jdk: oraclejdk7 + env: RUN_RUBY=false RUN_SCALA=true - jdk: oraclejdk7 env: RUN_RUBY=true RUN_SCALA=false GEM_NAME=collins-client - jdk: oraclejdk7