Skip to content

Commit 9623246

Browse files
shellbearshellbear
committed
feat: update go version to latest
1 parent 1fa086b commit 9623246

File tree

6 files changed

+34
-76
lines changed

6 files changed

+34
-76
lines changed

‎.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
name: Build
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Set up Go 1.14
12+
- name: Set up Go 1.20
1313
uses: actions/setup-go@v1
1414
with:
15-
go-version: 1.14
15+
go-version: 1.20
1616
id: go
1717

1818
- name: Check out code into the Go module directory

‎.github/workflows/release.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,30 @@ name: release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
99
goreleaser:
1010
runs-on: ubuntu-latest
1111
steps:
12-
-
13-
name: Checkout
14-
uses: actions/checkout@v2
15-
-
16-
name: Unshallow
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
- name: Unshallow
1715
run: git fetch --prune --unshallow
18-
-
19-
name: Set up Go
20-
uses: actions/setup-go@v1
16+
- name: Set up Go
17+
uses: actions/setup-go@v4
2118
with:
22-
go-version: 1.14.x
23-
-
24-
name: Docker login
19+
go-version: 1.20.x
20+
- name: Docker login
2521
uses: azure/docker-login@v1
2622
with:
2723
login-server: docker.pkg.github.com
2824
username: ${{ secrets.DOCKER_USERNAME }}
2925
password: ${{ secrets.DOCKER_PASSWORD }}
30-
-
31-
name: Run GoReleaser
32-
uses: goreleaser/goreleaser-action@v1
26+
- name: Run GoReleaser
27+
uses: goreleaser/goreleaser-action@v4
3328
with:
3429
version: latest
35-
args: release --rm-dist
30+
args: release --clean
3631
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}

‎.goreleaser.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
before:
22
hooks:
33
- go mod download
4-
archives:
5-
- replacements:
6-
darwin: Darwin
7-
linux: Linux
8-
windows: Windows
9-
386: i386
10-
amd64: x86_64
4+
115
checksum:
12-
name_template: 'checksums.txt'
6+
name_template: "checksums.txt"
137
snapshot:
148
name_template: "{{ .Tag }}-next"
159
changelog:
1610
sort: asc
1711
filters:
1812
exclude:
19-
- '^docs:'
20-
- '^test:'
13+
- "^docs:"
14+
- "^test:"
2115

2216
release:
2317
github:
2418
owner: shellbear
2519
name: web-watcher
2620

2721
dockers:
28-
-
29-
binaries:
22+
- ids:
3023
- web-watcher
3124
dockerfile: Dockerfile.cgo
3225
image_templates:
@@ -38,4 +31,3 @@ dockers:
3831
- "--label=org.opencontainers.image.name={{.ProjectName}}"
3932
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
4033
- "--label=org.opencontainers.image.version={{.Version}}"
41-

‎go.mod

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
module github.com/shellbear/web-watcher
22

3-
go 1.14
3+
go 1.20
44

55
require (
66
github.com/OneOfOne/xxhash v1.2.8
77
github.com/bwmarrin/discordgo v0.27.1
8-
github.com/gorilla/websocket v1.5.0 // indirect
98
github.com/jinzhu/gorm v1.9.16
10-
github.com/mattn/go-sqlite3 v1.14.17 // indirect
119
github.com/pmezard/go-difflib v1.0.0
1210
golang.org/x/net v0.12.0
1311
)
12+
13+
require (
14+
github.com/gorilla/websocket v1.5.0 // indirect
15+
github.com/jinzhu/inflection v1.0.0 // indirect
16+
github.com/mattn/go-sqlite3 v1.14.17 // indirect
17+
golang.org/x/crypto v0.11.0 // indirect
18+
golang.org/x/sys v0.10.0 // indirect
19+
)

‎go.sum

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,58 +26,28 @@ github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
2626
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
2727
github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
2828
github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
29-
github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
30-
github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
3129
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3230
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
33-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
3431
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3532
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3633
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
3734
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
38-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3935
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
4036
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
41-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
42-
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
4337
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
4438
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
45-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4639
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4740
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
4841
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
49-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
50-
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
51-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
5242
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
5343
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
54-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
55-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
56-
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5744
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5845
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5946
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6047
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
61-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
62-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
63-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
64-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
65-
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6648
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
6749
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6850
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
69-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
70-
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
71-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
72-
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
7351
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
7452
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
75-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
76-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
77-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
78-
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
7953
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
80-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
81-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
82-
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
83-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎watcher/task.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ import (
66
"context"
77
"fmt"
88
"io"
9-
"io/ioutil"
109
"log"
1110
"net/http"
1211
"strconv"
1312
"time"
1413

1514
"github.com/OneOfOne/xxhash"
16-
"golang.org/x/net/html"
17-
1815
"github.com/shellbear/web-watcher/models"
16+
"golang.org/x/net/html"
1917
)
2018

2119
const updateFormat = "2006-01-02 15:04:05"
@@ -43,13 +41,9 @@ func (w *Watcher) NewTask(task *models.Task) {
4341
// This hash will be used to speed up future page comparisons.
4442
func (w *Watcher) getHash(resp *http.Response) (string, []byte, error) {
4543
xxHash := xxhash.New64()
46-
body, err := ioutil.ReadAll(resp.Body)
47-
if err != nil {
48-
return "", nil, err
49-
}
5044

5145
// Parse page as HTML.
52-
doc, err := html.Parse(bytes.NewBuffer(body))
46+
doc, err := html.Parse(resp.Body)
5347
if err != nil {
5448
return "", nil, err
5549
}
@@ -62,7 +56,7 @@ func (w *Watcher) getHash(resp *http.Response) (string, []byte, error) {
6256
return "", nil, err
6357
}
6458

65-
body = buf.Bytes()
59+
body := buf.Bytes()
6660
// Create a unique hash for the page content.
6761
if _, err := xxHash.Write(body); err != nil {
6862
return "", nil, err
@@ -72,11 +66,12 @@ func (w *Watcher) getHash(resp *http.Response) (string, []byte, error) {
7266
}
7367

7468
// Create a unique hash for the page content.
75-
if _, err := xxHash.Write(body); err != nil {
69+
hash := []byte{}
70+
if _, err := xxHash.Write(hash); err != nil {
7671
return "", nil, err
7772
}
7873

79-
return strconv.FormatUint(xxHash.Sum64(), 10), body, nil
74+
return strconv.FormatUint(xxHash.Sum64(), 10), hash, nil
8075
}
8176

8277
// Analyze page structure, extract tags and check difference ratio between changes.

0 commit comments

Comments
 (0)