Skip to content

Commit 1dc3a95

Browse files
waybackarchiverwaybackarchiver
committed
Upgrade Go version to 1.17
1 parent 4af2e98 commit 1dc3a95

File tree

12 files changed

+35
-36
lines changed

12 files changed

+35
-36
lines changed

‎.github/workflows/builder.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ jobs:
8989
- name: Set up Go 1.x
9090
uses: actions/setup-go@v2
9191
with:
92-
go-version: ^1.16
92+
go-version: ^1.17
9393

9494
- name: Check out code base
95-
if: github.event_name == 'push'
95+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
9696
uses: actions/checkout@v2
9797
with:
9898
fetch-depth: 0
@@ -158,7 +158,7 @@ jobs:
158158
GOARM: ${{ matrix.arm }}
159159
steps:
160160
- name: Check out code base
161-
if: github.event_name == 'push'
161+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
162162
uses: actions/checkout@v2
163163
with:
164164
fetch-depth: 0
@@ -197,7 +197,7 @@ jobs:
197197
runs-on: ubuntu-latest
198198
steps:
199199
- name: Check out code base
200-
if: github.event_name == 'push'
200+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
201201
uses: actions/checkout@v2
202202
with:
203203
fetch-depth: 0
@@ -224,7 +224,7 @@ jobs:
224224
runs-on: ubuntu-latest
225225
steps:
226226
- name: Check out code base
227-
if: github.event_name == 'push'
227+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
228228
uses: actions/checkout@v2
229229
with:
230230
fetch-depth: 0
@@ -264,7 +264,7 @@ jobs:
264264
- amd64
265265
steps:
266266
- name: Check out code base
267-
if: github.event_name == 'push'
267+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
268268
uses: actions/checkout@v2
269269
with:
270270
fetch-depth: 0
@@ -311,7 +311,7 @@ jobs:
311311
runs-on: ubuntu-latest
312312
steps:
313313
- name: Check out code base
314-
if: github.event_name == 'push'
314+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
315315
uses: actions/checkout@v2
316316
with:
317317
fetch-depth: 0
@@ -326,7 +326,7 @@ jobs:
326326
- name: Set up Go 1.x
327327
uses: actions/setup-go@v2
328328
with:
329-
go-version: ^1.16
329+
go-version: ^1.17
330330

331331
- name: Setup Flatpak
332332
run: |

‎.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- name: Set up Go 1.x
8181
uses: actions/setup-go@v2
8282
with:
83-
go-version: ^1.16
83+
go-version: ^1.17
8484

8585
- name: Build fat binary
8686
id: builder
@@ -243,7 +243,7 @@ jobs:
243243
- name: Set up Go 1.x
244244
uses: actions/setup-go@v2
245245
with:
246-
go-version: ^1.16
246+
go-version: ^1.17
247247

248248
- name: Setup Flatpak
249249
run: |
@@ -316,7 +316,7 @@ jobs:
316316
git log --oneline ${PREVVER}..${GITVER} > gittaglogs.txt
317317
MORE=$(echo "See full [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ github.sha }}/CHANGELOG.md)")
318318
echo -e "*Release ${GITVER}* #wayback\n" > release-note.md
319-
cut -c9- gittaglogs.txt | sed -e 's/^/- /' >> release-note.md
319+
cut -c9- gittaglogs.txt | sed -e 's/^/- /' | sed -e 's/\"/\\"/g' >> release-note.md
320320
echo -e "\n${MORE}" | tee -a release-note.md gittaglogs.txt > /dev/null
321321
# Append digests
322322
echo '

‎.github/workflows/testing.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
os: [ ubuntu-latest, macos-latest, windows-latest ]
32-
#go: [ "1.13", "1.14", "1.15", "1.16" ]
32+
go: [ "1.16", "1.17" ]
3333
env:
3434
SENDER_UID: ${{ secrets.MATRIX_SENDER_UID }}
3535
SENDER_PWD: ${{ secrets.MATRIX_SENDER_PWD }}
@@ -39,11 +39,10 @@ jobs:
3939
WAYBACK_DISCORD_BOT_TOKEN: ${{ secrets.WAYBACK_DISCORD_BOT_TOKEN }}
4040
WAYBACK_DISCORD_CHANNEL: ${{ secrets.WAYBACK_DISCORD_CHANNEL }}
4141
steps:
42-
- name: Set up Go 1.x
42+
- name: Set up Go ${{ matrix.go }}.x
4343
uses: actions/setup-go@v2
4444
with:
45-
#go-version: ${{ matrix.go }}
46-
go-version: "1.16"
45+
go-version: ${{ matrix.go }}
4746

4847
- name: Set up IPFS
4948
uses: ibnesayeed/setup-ipfs@master
@@ -113,7 +112,7 @@ jobs:
113112
# echo "$(which wget)" >> $GITHUB_PATH
114113
115114
- name: Check out code base
116-
if: github.event_name == 'push'
115+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
117116
uses: actions/checkout@v2
118117
with:
119118
fetch-depth: 0

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.2
2-
ARG GO_VERSION=1.16
2+
ARG GO_VERSION=1.17
33

44
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
55
COPY --from=tonistiigi/xx:golang / /

‎build/docker/Dockerfile.all

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.2
2-
ARG GO_VERSION=1.16
2+
ARG GO_VERSION=1.17
33

44
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
55
COPY --from=tonistiigi/xx:golang / /

‎build/docker/Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.2
2-
ARG GO_VERSION=1.16
2+
ARG GO_VERSION=1.17
33

44
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine AS builder
55

‎config/parser.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func defaultFilenames() []string {
252252
return []string{
253253
name,
254254
filepath.Join(home, name),
255-
filepath.Join("/etc", name),
255+
filepath.Join("/", "etc", name),
256256
}
257257
}
258258

‎config/parser_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestGetDefaultFilenames(t *testing.T) {
8585
}
8686

8787
home, _ := os.UserHomeDir()
88-
paths := fmt.Sprintf("%s %s %s", "wayback.conf", filepath.Join(home, "wayback.conf"), "/etc/wayback.conf")
88+
paths := fmt.Sprintf("%s %s %s", "wayback.conf", filepath.Join(home, "wayback.conf"), filepath.Join("/", "etc", "wayback.conf"))
8989
for _, path := range files {
9090
if !strings.Contains(paths, path) {
9191
t.Errorf(`Unexpected file path got %s instead within '%s'`, path, paths)

‎docker-bake.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Go version
22
variable "GO_VERSION" {
3-
default = "1.16"
3+
default = "1.17"
44
}
55

66
target "go-version" {

‎go.mod

+4-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/dghubble/oauth1 v0.7.0
1717
github.com/dustin/go-humanize v1.0.0
1818
github.com/fatih/color v1.12.0
19-
github.com/gabriel-vasile/mimetype v1.3.1
19+
github.com/gabriel-vasile/mimetype v1.3.2-0.20210818094218-3b6e27b78bcf
2020
github.com/go-shiori/go-readability v0.0.0-20210627123243-82cc33435520
2121
github.com/go-shiori/obelisk v0.0.0-20201115143556-8de0d40b0a9b // indirect
2222
github.com/google/go-github/v38 v38.1.0
@@ -36,7 +36,7 @@ require (
3636
github.com/prometheus/client_golang v1.11.0
3737
github.com/prometheus/common v0.30.0
3838
github.com/robertkrimen/otto v0.0.0-20210614181706-373ff5438452 // indirect
39-
github.com/slack-go/slack v0.9.3
39+
github.com/slack-go/slack v0.9.4
4040
github.com/spf13/cobra v1.2.1
4141
github.com/tdewolff/parse/v2 v2.5.19 // indirect
4242
github.com/thoj/go-ircevent v0.0.0-20190807115034-8e7ce4b5a1eb
@@ -54,16 +54,14 @@ require (
5454
github.com/wabarc/wbipfs v0.2.0
5555
github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b // indirect
5656
go.etcd.io/bbolt v1.3.6
57-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
57+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
5858
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
5959
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
6060
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
6161
golang.org/x/text v0.3.7 // indirect
6262
gopkg.in/tucnak/telebot.v2 v2.4.0
63-
maunium.net/go/mautrix v0.9.17
63+
maunium.net/go/mautrix v0.9.19
6464
mvdan.cc/xurls/v2 v2.3.0 // indirect
6565
)
6666

6767
replace github.com/go-shiori/obelisk => github.com/wabarc/obelisk v0.0.0-20210420023708-aac2bcc00a78
68-
69-
replace github.com/gabriel-vasile/mimetype => github.com/wabarc/mimetype v1.3.2-0.20210814000005-c49e03777d46

‎go.sum

+9-8
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
170170
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
171171
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
172172
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
173+
github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
174+
github.com/gabriel-vasile/mimetype v1.3.2-0.20210818094218-3b6e27b78bcf h1:01c7p8xsnjrHEJ2zTQFMJa3DQ6jljIJufN0hG5b9jX4=
175+
github.com/gabriel-vasile/mimetype v1.3.2-0.20210818094218-3b6e27b78bcf/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
173176
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
174177
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
175178
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -522,8 +525,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
522525
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
523526
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
524527
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
525-
github.com/slack-go/slack v0.9.3 h1:H1UwldF1zWQakjaSymbHMgG3Pg1BiClez/a7JRLdxKc=
526-
github.com/slack-go/slack v0.9.3/go.mod h1:wWL//kk0ho+FcQXcBTmEafUI5dz4qz5f4mMk8oIkioQ=
528+
github.com/slack-go/slack v0.9.4 h1:C+FC3zLxLxUTQjDy2RZeMHYon005zsCROiZNWVo+opQ=
529+
github.com/slack-go/slack v0.9.4/go.mod h1:wWL//kk0ho+FcQXcBTmEafUI5dz4qz5f4mMk8oIkioQ=
527530
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
528531
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
529532
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -609,8 +612,6 @@ github.com/wabarc/logger v0.0.0-20210730133522-86bd3f31e792 h1:0xD4NsQtdPCB77q4w
609612
github.com/wabarc/logger v0.0.0-20210730133522-86bd3f31e792/go.mod h1:2an5YHL0CegFbaDNSU3kwqYRfxFfmcwlwSi5Bk4yk5c=
610613
github.com/wabarc/memento v0.0.0-20210703205719-adc2f8ab8bae h1:7TLEQYM7GxeysDd6IbK5F7krZuYEipdXno9qV3eedWU=
611614
github.com/wabarc/memento v0.0.0-20210703205719-adc2f8ab8bae/go.mod h1:qP6GisnqoSDc5Ivj34yV+Qar3B6tYyLDKx42oCDX1zY=
612-
github.com/wabarc/mimetype v1.3.2-0.20210814000005-c49e03777d46 h1:/idRvI2Zm7oiG8QxogDgmiSui7wn9Fj5UufxaOqB31I=
613-
github.com/wabarc/mimetype v1.3.2-0.20210814000005-c49e03777d46/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
614615
github.com/wabarc/obelisk v0.0.0-20210420023708-aac2bcc00a78 h1:iWcCLB7Ru5lurvN0aehmRj00ETjuGSBUhJJ9EOHfHyk=
615616
github.com/wabarc/obelisk v0.0.0-20210420023708-aac2bcc00a78/go.mod h1:OlGUo0utWqPMcej0HirsoK2+65Je/ZPFNwasF/O3KYM=
616617
github.com/wabarc/playback v0.0.0-20210718054702-cab6c6004933 h1:KZHhUK+ZRhe4OxQ0+/H40jsS8NCCGJlY1jO7mzOdYyY=
@@ -676,8 +677,8 @@ golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm
676677
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
677678
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
678679
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
679-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
680-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
680+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
681+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
681682
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
682683
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
683684
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1075,8 +1076,8 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
10751076
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10761077
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
10771078
maunium.net/go/maulogger/v2 v2.2.4/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
1078-
maunium.net/go/mautrix v0.9.17 h1:4rRAN11LPQGS0TOGEb4uppUzGet7nSwT9C0jHzSWmtg=
1079-
maunium.net/go/mautrix v0.9.17/go.mod h1:7IzKfWvpQtN+W2Lzxc0rLvIxFM3ryKX6Ys3S/ZoWbg8=
1079+
maunium.net/go/mautrix v0.9.19 h1:8ZoDuijJOKxgEOMDoBN2B6at0Ba7EJpsqWA/5jV7ELw=
1080+
maunium.net/go/mautrix v0.9.19/go.mod h1:7IzKfWvpQtN+W2Lzxc0rLvIxFM3ryKX6Ys3S/ZoWbg8=
10801081
mvdan.cc/xurls/v2 v2.2.0/go.mod h1:EV1RMtya9D6G5DMYPGD8zTQzaHet6Jh8gFlRgGRJeO8=
10811082
mvdan.cc/xurls/v2 v2.3.0 h1:59Olnbt67UKpxF1EwVBopJvkSUBmgtb468E4GVWIZ1I=
10821083
mvdan.cc/xurls/v2 v2.3.0/go.mod h1:AjuTy7gEiUArFMjgBBDU4SMxlfUYsRokpJQgNWOt3e4=

‎service/relaychat/relaychat_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by the GNU GPL v3
33
// license that can be found in the LICENSE file.
44

5+
//go:build !race
56
// +build !race
67

78
package relaychat // import "github.com/wabarc/wayback/service/relaychat"

0 commit comments

Comments
 (0)