Skip to content

Commit f5d0105

Browse files
authored
Merge pull request #31 from wechaty/upgrade_wechaty
upgrade wechaty
2 parents 0095588 + 83f8415 commit f5d0105

File tree

11 files changed

+190
-63
lines changed

11 files changed

+190
-63
lines changed

.github/workflows/go.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,32 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414

15-
- name: Set up Go 1.14
15+
- name: Set up Go 1.18
1616
uses: actions/setup-go@v1
1717
with:
18-
go-version: 1.14
18+
go-version: 1.18
1919
id: go
2020

2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v2
2323

24-
- name: Get dependencies
25-
run: go vet ./...
26-
2724
- name: Install dependencies
2825
run: make install
2926

27+
- name: Go Vet
28+
run: |
29+
go mod download
30+
go vet ./...
31+
3032
- name: Go Test
3133
run: make test
32-
34+
3335
push:
3436
name: Push Docker image to Github Packages
3537
runs-on: ubuntu-latest
3638
needs: build
3739
if: github.event_name != 'pull_request'
38-
steps:
40+
steps:
3941
- name: Checkout
4042
uses: actions/checkout@v2
4143

.github/workflows/win.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ jobs:
1818
- name: Setup Go environment
1919
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.14.4 # optional
21+
go-version: 1.18 # optional
2222

2323
- name: Build Dingdongbot
2424
run: |
25-
go vet ./...
2625
make install
26+
go mod download
27+
go vet ./...
2728
make test

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.dll
55
*.so
66
*.dylib
7+
.idea/
78

89
# Test binary, built with `go test -c`
910
*.test
@@ -14,5 +15,4 @@
1415
# Dependency directories (remove the comment below to include it)
1516
# vendor/
1617

17-
go.sum
18-
ding-dong-bot
18+
ding-dong-bot

.idea/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/go-wechaty-getting-started.iml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ all: install bot
33

44
.PHONY: install
55
install:
6-
go get -u golang.org/x/lint/golint
6+
go install golang.org/x/lint/golint@latest
77

88
.PHONY: bot
99
bot:

go.mod

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@ module github.com/wechaty/go-wechaty-getting-started
22

33
go 1.18
44

5-
require github.com/wechaty/go-wechaty v0.3.9
5+
require github.com/wechaty/go-wechaty v0.4.0
66

77
require (
8-
github.com/bitly/go-simplejson v0.5.0 // indirect
9-
github.com/golang/protobuf v1.4.0 // indirect
10-
github.com/google/uuid v1.1.1 // indirect
8+
github.com/golang/protobuf v1.5.2 // indirect
9+
github.com/google/uuid v1.1.2 // indirect
10+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0 // indirect
1111
github.com/hashicorp/golang-lru v0.5.4 // indirect
12-
github.com/kr/text v0.2.0 // indirect
1312
github.com/lucsky/cuid v1.0.2 // indirect
1413
github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
1514
github.com/otiai10/opengraph v1.1.1 // indirect
1615
github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086 // indirect
1716
github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 // indirect
18-
github.com/wechaty/go-grpc v0.18.12 // indirect
19-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
20-
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
21-
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
17+
github.com/wechaty/go-grpc v1.5.2 // indirect
18+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
19+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
2220
golang.org/x/text v0.3.7 // indirect
23-
golang.org/x/tools v0.1.10 // indirect
24-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
25-
google.golang.org/genproto v0.0.0-20200416231807-8751e049a2a0 // indirect
26-
google.golang.org/grpc v1.28.1 // indirect
27-
google.golang.org/protobuf v1.21.0 // indirect
21+
google.golang.org/genproto v0.0.0-20220317150908-0efb43f6373e // indirect
22+
google.golang.org/grpc v1.45.0 // indirect
23+
google.golang.org/protobuf v1.27.1 // indirect
2824
)

0 commit comments

Comments
 (0)