From ed540879f69e5acc7ee0704b9fc236e89390eb34 Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Wed, 29 Aug 2018 16:07:19 -0500 Subject: [PATCH 1/2] travis: bump golang version Update golang version from 1.8 to 1.10, which is the one used in runtime repo. Signed-off-by: Salvador Fuentes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 55ffe1e686..dd9f56044a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ language: go go_import_path: github.com/kata-containers/agent go: - - 1.8 + - "1.10.x" before_script: - ".ci/static-checks.sh" From 157f1c12136a102526c3dc0c00860baeb1daf7a7 Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Wed, 29 Aug 2018 16:15:19 -0500 Subject: [PATCH 2/2] travis: Add variable needed to run static checks Now that we support multiple branches, we changed how static-checks.sh compares branches. We now need a variable called $target_branch to make the correct comparison when testing a PR. Fixes: #342. Signed-off-by: Salvador Fuentes --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd9f56044a..da13f7998b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ go_import_path: github.com/kata-containers/agent go: - "1.10.x" +env: + - target_branch=$TRAVIS_BRANCH + before_script: - ".ci/static-checks.sh"