From cf20c9b56967071c4a2d33bd537de5ddef3d41e8 Mon Sep 17 00:00:00 2001 From: Gabriela Cervantes Date: Tue, 23 Jul 2019 01:36:27 -0500 Subject: [PATCH] ci: Allow travis to use go install script This allows travis to use the go install script instead of having a hard coded golang version at travis.yml Fixes #613 Signed-off-by: Gabriela Cervantes --- .ci/install_go.sh | 16 ++++++++++++++++ .travis.yml | 5 ++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100755 .ci/install_go.sh diff --git a/.ci/install_go.sh b/.ci/install_go.sh new file mode 100755 index 0000000000..55c3383ccb --- /dev/null +++ b/.ci/install_go.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# +# Copyright (c) 2019 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +set -e + +cidir=$(dirname "$0") +source "${cidir}/lib.sh" + +clone_tests_repo + +pushd "${tests_repo_dir}" +.ci/install_go.sh -p -f +popd diff --git a/.travis.yml b/.travis.yml index 8d124a99e5..d486574323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,18 +14,17 @@ os: language: go go_import_path: github.com/kata-containers/agent -go: - - "1.11.x" - env: - target_branch=$TRAVIS_BRANCH before_script: + - ".ci/install_go.sh" - ".ci/static-checks.sh" before_install: - sudo apt-get update -qq - sudo apt-get install -y -qq automake + - sudo apt-get install -y moreutils install: - cd ${TRAVIS_BUILD_DIR} && make