From 41f7af81294a4fdac80774c26bb03fdeb6d214cb Mon Sep 17 00:00:00 2001 From: vcaesar Date: Sun, 8 Dec 2019 16:03:24 -0400 Subject: [PATCH 1/6] update gohook pkg and robot info test code --- go.mod | 4 ++-- go.sum | 4 ++-- robot_info_test.go | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index df07b7b..5ff8b40 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ require ( github.com/lxn/win v0.0.0-20191024121223-cc00c7492fe1 github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect github.com/otiai10/gosseract v2.2.1+incompatible - github.com/robotn/gohook v0.0.0-20191113163729-aaa2000ed97a + github.com/robotn/gohook v0.0.0-20191208195706-98eb507a75d9 github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934 github.com/robotn/xgbutil v0.0.0-20190912154524-c861d6f87770 github.com/stretchr/testify v1.3.0 // indirect @@ -16,6 +16,6 @@ require ( golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect ) -//replace golang.org/x/sys => github.com/golang/sys v0.0.0-20190109145017-48ac38b7c8cb +// replace golang.org/x/sys => github.com/golang/sys v0.0.0-20190109145017-48ac38b7c8cb go 1.13 diff --git a/go.sum b/go.sum index 794cc04..8c46386 100644 --- a/go.sum +++ b/go.sum @@ -24,8 +24,8 @@ github.com/otiai10/mint v1.2.4 h1:DxYL0itZyPaR5Z9HILdxSoHx+gNs6Yx+neOGS3IVUk0= github.com/otiai10/mint v1.2.4/go.mod h1:d+b7n/0R3tdyUYYylALXpWQ/kTN+QobSq/4SRGBkR3M= 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/robotn/gohook v0.0.0-20191113163729-aaa2000ed97a h1:FQyuXENg2qU4ZW4HfaDgVswCFTtBWmutmJX+d4ka6TA= -github.com/robotn/gohook v0.0.0-20191113163729-aaa2000ed97a/go.mod h1:n1o8s7fg6QGcgIsN9AmWQnBi6KrcbEUX0kFVUwTP53g= +github.com/robotn/gohook v0.0.0-20191208195706-98eb507a75d9 h1:7vKLsPiS3XTrejZHaoKDS3/26K3t10rAtuf1+fRfIVA= +github.com/robotn/gohook v0.0.0-20191208195706-98eb507a75d9/go.mod h1:n1o8s7fg6QGcgIsN9AmWQnBi6KrcbEUX0kFVUwTP53g= github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934 h1:2lhSR8N3T6I30q096DT7/5AKEIcf1vvnnWAmS0wfnNY= github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934/go.mod h1:SxQhJskUJ4rleVU44YvnrdvxQr0tKy5SRSigBrCgyyQ= github.com/robotn/xgbutil v0.0.0-20190912154524-c861d6f87770 h1:2uX8QRLkkxn2EpAQ6I3KhA79BkdRZfvugJUzJadiJwk= diff --git a/robot_info_test.go b/robot_info_test.go index 71f2fe6..3636552 100644 --- a/robot_info_test.go +++ b/robot_info_test.go @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// +build darwin windows - package robotgo import ( From 833ec8956f711f7340485598f7ee7c18e930662e Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 9 Dec 2019 11:16:12 -0400 Subject: [PATCH 2/6] update and fmt config.yml, add go test support --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7735ceb..5c91bdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,12 +10,12 @@ jobs: - checkout # specify any bash command here prefixed with `run: ` # override: - # './...' is a relative pattern which means all subdirectories + # './...' is a relative pattern which means all subdirectories # - run: go get -u github.com/go-vgo/robotgo # - run: go get -u golang.org/x/sys/unix # - run: go get -u github.com/shirou/gopsutil - run: go get -v -t -d ./... - - run: go test -v ./... + - run: xvfb-run go test -v ./... # codecov.io # - run: go test -v -covermode=count -coverprofile=coverage.out - # - run: bash <(curl -s https://codecov.io/bash) \ No newline at end of file + # - run: bash <(curl -s https://codecov.io/bash) From ca5f3ad7010095a29e01c82f0017d99bdc90e591 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 9 Dec 2019 12:38:21 -0400 Subject: [PATCH 3/6] update config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c91bdf..1ada82b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,8 @@ jobs: steps: - checkout # specify any bash command here prefixed with `run: ` + - run: sudo apt-get update + - run: sudo apt-get install xvfb # override: # './...' is a relative pattern which means all subdirectories # - run: go get -u github.com/go-vgo/robotgo From f0d84c03104ae18043279f60af3d100518cb0950 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 9 Dec 2019 12:40:36 -0400 Subject: [PATCH 4/6] update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ada82b..437dd72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,8 @@ jobs: steps: - checkout # specify any bash command here prefixed with `run: ` - - run: sudo apt-get update - - run: sudo apt-get install xvfb + - run: apt-get update + - run: apt-get install xvfb # override: # './...' is a relative pattern which means all subdirectories # - run: go get -u github.com/go-vgo/robotgo From a451b336791cdb5bf075e4cdb1f2760ae79b90ab Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 9 Dec 2019 12:43:27 -0400 Subject: [PATCH 5/6] update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 437dd72..f971c4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - checkout # specify any bash command here prefixed with `run: ` - run: apt-get update - - run: apt-get install xvfb + - run: apt-get -y install xvfb # override: # './...' is a relative pattern which means all subdirectories # - run: go get -u github.com/go-vgo/robotgo From bd801f81ce6d3c82bbc2d8464696680c9440d20f Mon Sep 17 00:00:00 2001 From: vcaesar Date: Mon, 9 Dec 2019 12:49:48 -0400 Subject: [PATCH 6/6] update and fmt travis.yml --- .travis.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe70150..0f49e7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,21 +11,23 @@ go: # - tip addons: - apt: - packages: - - libx11-dev xorg-dev - - libxtst-dev libpng++-dev - - xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev - # - libusb-dev - - libxkbcommon-dev - - xsel - - xclip + apt: + packages: + - libx11-dev xorg-dev + - libxtst-dev libpng++-dev + - xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev + # - libusb-dev + - libxkbcommon-dev + - xsel + - xclip + # + - xvfb # script: # - sudo apt-get update # - sudo apt-get install libx11-dev # - sudo apt-get install xorg-dev -# - sudo apt-get install libxtst-dev libpng++-dev -# # Event: +# - sudo apt-get install libxtst-dev libpng++-dev +# # Event: # - sudo apt-get install xcb libxcb-xkb-dev x11-xkb-utils libx11-xcb-dev libxkbcommon-x11-dev # - sudo apt-get install libxkbcommon-dev # # Clipboard: @@ -35,5 +37,5 @@ addons: before_install: - export PATH=$PATH:$HOME/gopath/bin - - go get -t -v ./... - + - go get -v -t -d ./... + - xvfb-run go test -v ./...