From 21f4937ebcdbf5b11d0ce5fdf5093f9c0dc7273f Mon Sep 17 00:00:00 2001 From: Nassim 'Nass' Eddequiouaq Date: Wed, 27 Jun 2018 11:58:22 +0200 Subject: [PATCH 1/4] fix osxkeychain ci Signed-off-by: Nassim 'Nass' Eddequiouaq --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index bf1ac60..1df66fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,11 @@ email: false go: - 1.8 + before_install: + # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307 + # might not be necessary in the future + - command curl -sSL https://rvm.io/mpapis.asc | gpg --import - + - rvm get stable install: make deps addons: apt: From 317219f3a664b664ac4765c92949c17860730674 Mon Sep 17 00:00:00 2001 From: Nassim 'Nass' Eddequiouaq Date: Wed, 27 Jun 2018 12:13:18 +0200 Subject: [PATCH 2/4] Fix yarn complaint in travisci Signed-off-by: Nassim 'Nass' Eddequiouaq --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1df66fa..fdf1afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,13 @@ # might not be necessary in the future - command curl -sSL https://rvm.io/mpapis.asc | gpg --import - - rvm get stable - install: make deps addons: apt: packages: - libsecret-1-dev - pass before_script: + - make deps - "export DISPLAY=:99.0" - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh ci/before_script_linux.sh; fi - make validate From 91fc39d57ad4ed5ec8bf3169edb8cebd50939100 Mon Sep 17 00:00:00 2001 From: Nassim 'Nass' Eddequiouaq Date: Wed, 27 Jun 2018 12:27:44 +0200 Subject: [PATCH 3/4] install yarn on osx for travisci Signed-off-by: Nassim 'Nass' Eddequiouaq --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fdf1afc..7b682ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,14 @@ sudo: required language: go dist: trusty + osx_image: xcode9 os: - linux - osx notifications: email: false go: - - 1.8 + - 1.8.1 before_install: # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307 # might not be necessary in the future From b049338a6b5ae291f20fba0636fd7d7da22d3fb6 Mon Sep 17 00:00:00 2001 From: Nassim 'Nass' Eddequiouaq Date: Wed, 27 Jun 2018 13:40:23 +0200 Subject: [PATCH 4/4] Fix appveyor windows ci Signed-off-by: Nassim 'Nass' Eddequiouaq --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 282e1d5..04eadb0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,13 +2,13 @@ image: Visual Studio 2015 environment: GOPATH: c:\gopath +stack: go 1.8.7 + clone_folder: c:\gopath\src\github.com\docker\docker-credential-helpers clone_depth: 10 before_build: - set PATH=%PATH%;C:\MinGW\bin; - - set PATH=%PATH%;C:\go18\bin; - - set GOROOT=C:\go18 build_script: - mingw32-make vet_win wincred