github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 11:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into build-go-verbose

Browse Source
This commit is contained in:
Andriy Yurchuk
2014-09-04 22:16:24 +03:00
parent 24d0eb43ec 306edbb7c2
commit 22ce0022d1
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/install-etcd.sh
View File

@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cd third_party
git clone https://github.com/coreos/etcd.git
cd etcd
git checkout ab4bcc18694644d12f0c038339d8d039072502b1

7
hack/test-go.sh
View File

@@ -46,11 +46,12 @@ find_test_pkgs() {
# there is currently a race in the coverage code in tip. Remove this when it is fixed
# see https://code.google.com/p/go/issues/detail?id=8630 for details.
if [[ "${TRAVIS_GO_VERSION}" -eq "tip" ]]; then
if [ "${TRAVIS_GO_VERSION}" == "tip" ]; then
KUBE_COVER=""
else
# -covermode=atomic becomes default with -race in Go >=1.3
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
fi
# -covermode=atomic becomes default with -race in Go >=1.3
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}
cd "${KUBE_TARGET}"

2
hack/verify-boilerplate.sh
View File

@@ -18,7 +18,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
result=0
gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")"
gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")"
for file in ${gofiles}; do
if [[ "$(${REPO_ROOT}/hooks/boilerplate.sh "${file}")" -eq "0" ]]; then
echo "Boilerplate header is wrong for: ${file}"