1
0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30

Merge pull request #142 from ulrich/fix_travis_ci

Fix Travis configuration, update XCode version, Golang version and set to minimum macOS version to 10.11.
This commit is contained in:
Sebastiaan van Stijn
2019-04-26 09:27:06 -07:00
committed by GitHub
4 changed files with 6 additions and 11 deletions
+2 -7
View File
@@ -3,19 +3,14 @@
sudo: required sudo: required
language: go language: go
dist: trusty dist: trusty
osx_image: xcode9 osx_image: xcode10.1
os: os:
- linux - linux
- osx - osx
notifications: notifications:
email: false email: false
go: go:
- 1.8.1 - 1.12.x
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
addons: addons:
apt: apt:
packages: packages:
+1 -1
View File
@@ -6,7 +6,7 @@ VERSION := $(shell grep 'const Version' credentials/version.go | awk -F'"' '{ pr
all: test all: test
deps: deps:
go get -u github.com/golang/lint/golint go get -u golang.org/x/lint/golint
clean: clean:
rm -rf bin rm -rf bin
+1 -1
View File
@@ -1,4 +1,4 @@
package credentials package credentials
// Version holds a string describing the current version // Version holds a string describing the current version
const Version = "0.6.0" const Version = "0.6.1"
+2 -2
View File
@@ -1,8 +1,8 @@
package osxkeychain package osxkeychain
/* /*
#cgo CFLAGS: -x objective-c -mmacosx-version-min=10.10 #cgo CFLAGS: -x objective-c -mmacosx-version-min=10.11
#cgo LDFLAGS: -framework Security -framework Foundation -mmacosx-version-min=10.10 #cgo LDFLAGS: -framework Security -framework Foundation -mmacosx-version-min=10.11
#include "osxkeychain_darwin.h" #include "osxkeychain_darwin.h"
#include <stdlib.h> #include <stdlib.h>