Simplify the builds

salesforce · Feb 7, 2019 · cd2fa5b · cd2fa5b
1 parent 533c65d
commit cd2fa5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,22 +46,14 @@ jobs:
           name: Compile project
           command: java -version && ./gradlew -v && ./gradlew --parallel testScoverageClasses
       - *save-gradle-cache
-  scala-style-hw:
-      <<: *machine-config
-      steps:
-        - checkout
-        - *open-jdk
-        - run:
-            name: Scala style check for HelloWorld
-            command: cd helloworld && ./gradlew --parallel scalaStyle && cd ..
   compile-hw:
       <<: *machine-config
       steps:
         - checkout
         - *open-jdk
         - run:
             name: Compile Helloworld project
-            command: cd helloworld && ./gradlew --parallel testScoverageClasses && cd ..
+            command: cd helloworld && ./gradlew --parallel scalaStyle test && cd ..
 
   test:
     <<: *machine-config
@@ -102,7 +94,6 @@ workflows:
     jobs:
       - scala-style
       - compile
-      - scala-style-hw
       - compile-hw
       - test:
           requires:

diff --git a/.travis.yml b/.travis.yml
@@ -25,8 +25,8 @@ cache:
     - $BUILD_CACHE_DIR
 jobs:
   include:
-    - stage: 'Clone repo and compile project'
-      name: 'Clone repo & compile project'
+    - stage: 'Compile project'
+      name: 'Compile project'
       script: |
         find **/src/test/scala/* -type f -name '*.scala' | cut -d "/" -f5-$2 | sed 's/.\{6\}$/\*/g' > $TESTS_FILE_NAME
         TOTAL_TESTS=`cat $TESTS_FILE_NAME | wc -l`
@@ -39,10 +39,10 @@ jobs:
         sed -i 's/\\n$//g' "$TESTS_FILES_PREFIX"*
         popd
         ./gradlew scalaStyle testScoverageClasses --parallel
-    - stage: 'compile helloworld project'
-      name: 'compile helloworld project'
+    - stage: 'Compile Helloworld project'
+      name: 'Compile Helloworld project'
       script: |
-        cd helloworld && ./gradlew scalaStyle testScoverageClasses --parallel
+        cd helloworld && ./gradlew scalaStyle test --parallel
     - stage: 'Build'
       name: 'Build Part 1'
       script: |
@@ -72,6 +72,3 @@ jobs:
         echo -e "Test files running on this container : `eval $COUNT_TEST_FILE_CMD`\n$TEST_FILES\n"
         ./gradlew reportScoverage
       name: 'Build Part 4'
-    - script: |
-        cd helloworld && ./gradlew reportScoverage
-      name: 'Build - helloworld'