diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4f7b8df..8dbbdab 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ^1.14 + go-version: ^1.15 id: go - name: Get dependencies @@ -35,6 +35,7 @@ jobs: - name: Install Dependencies (Linux) run: | + sudo apt-get update sudo apt-get install python-gnomekeyring sudo apt-get install gnome-keyring dbus-launch /usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6fd9b09..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -sudo: required -dist: trusty - -os: - - osx - - linux - -language: go - -addons: - apt: - packages: - - python-gnomekeyring - - gnome-keyring - -go: - - 1.x - - tip - -before_script: - - | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - dbus-launch /usr/bin/python -c \ - "import gnomekeyring;gnomekeyring.create_sync('login', '');" - fi diff --git a/go.mod b/go.mod index 714e584..29416ad 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/zalando/go-keyring go 1.13 require ( - github.com/danieljoos/wincred v1.0.2 - github.com/godbus/dbus v4.1.0+incompatible - github.com/stretchr/testify v1.4.0 // indirect + github.com/danieljoos/wincred v1.1.0 + github.com/godbus/dbus/v5 v5.0.3 ) diff --git a/go.sum b/go.sum index 3a7cdd0..7023136 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,15 @@ -github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= -github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= +github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= +github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4= -github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/keyring_linux.go b/keyring_linux.go index 4148bd3..9d65533 100644 --- a/keyring_linux.go +++ b/keyring_linux.go @@ -2,7 +2,7 @@ package keyring import ( "fmt" - "github.com/godbus/dbus" + dbus "github.com/godbus/dbus/v5" "github.com/zalando/go-keyring/secret_service" ) diff --git a/secret_service/secret_service.go b/secret_service/secret_service.go index 591c976..e4644b1 100644 --- a/secret_service/secret_service.go +++ b/secret_service/secret_service.go @@ -4,7 +4,7 @@ import ( "fmt" "errors" - "github.com/godbus/dbus" + dbus "github.com/godbus/dbus/v5" ) const (