Merge pull request #6119 from hickeyma/readd-circleci-teststyle

chore(*): Re-enable style conformance test in circleci build

.circleci/config.yml

@@ -18,10 +18,12 @@ jobs:
       - restore_cache:
           keys:
             - build-cache-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
+      - run:
+          name: test style
+          command: make test-style
       - run:
           name: test
           command: make test-coverage
-
       - save_cache:
           key: gopkg-{{ checksum "Gopkg.lock" }}
           paths:
@@ -31,7 +33,6 @@ jobs:
           key: build-cache-{{ .Environment.CIRCLE_BUILD_NUM }}
           paths:
             - /tmp/go/cache
-
       - deploy:
           name: deploy
           command: .circleci/deploy.sh

.circleci/test.sh

@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright The Helm Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Bash 'Strict Mode'
-# http://redsymbol.net/articles/unofficial-bash-strict-mode
-set -euo pipefail
-IFS=$'\n\t'
-
-HELM_ROOT="${BASH_SOURCE[0]%/*}/.."
-cd "$HELM_ROOT"
-
-mkdir -p "${GOCACHE:-/tmp/go/cache}"
-
-run_unit_test() {
-  if [[ "${CIRCLE_BRANCH-}" == "master" ]]; then
-    echo "Running unit tests with coverage'"
-    ./scripts/coverage.sh --coveralls
-  else
-    echo "Running 'unit tests'"
-    make test-unit
-  fi
-}
-
-run_style_check() {
-  echo "Running 'make test-style'"
-  make test-style
-}
-
-# Build to ensure packages are compiled
-echo "Running 'make build'"
-make build
-
-case "${CIRCLE_NODE_INDEX-0}" in
-  0) run_unit_test   ;;
-  1) run_style_check ;;
-esac