Skip to content

Commit b8ab4cf

Browse files
antoniomikaantoniomika
authored
Merge pull request antoniomika#241 from antoniomika/am/upgrade-go-1-19
Updated sish to go 1.19
2 parents 8f44621 + 3768d42 commit b8ab4cf

File tree

5 files changed

+93
-102
lines changed

5 files changed

+93
-102
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@v2
2020
with:
21-
go-version: 1.18
21+
go-version: 1.19
2222
- name: Lint the codebase
2323
uses: golangci/golangci-lint-action@v2
2424
with:

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: 1.18
17+
go-version: 1.19
1818
- name: Run GoReleaser
1919
uses: goreleaser/goreleaser-action@v2
2020
with:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax = docker/dockerfile:experimental
2-
FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder
2+
FROM --platform=$BUILDPLATFORM golang:1.19-alpine as builder
33
LABEL maintainer="Antonio Mika <me@antoniomika.me>"
44

55
ENV CGO_ENABLED 0

‎go.mod‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/antoniomika/sish
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
77
github.com/antoniomika/syncmap v1.0.0
8-
github.com/caddyserver/certmagic v0.16.1
8+
github.com/caddyserver/certmagic v0.16.3
99
github.com/fsnotify/fsnotify v1.5.4
10-
github.com/gin-gonic/gin v1.7.7
10+
github.com/gin-gonic/gin v1.8.1
1111
github.com/gorilla/websocket v1.5.0
12-
github.com/jpillora/ipfilter v1.2.5
12+
github.com/jpillora/ipfilter v1.2.7
1313
github.com/logrusorgru/aurora v2.0.3+incompatible
1414
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
1515
github.com/pires/go-proxyproto v0.6.2
1616
github.com/radovskyb/watcher v1.0.7
17-
github.com/sirupsen/logrus v1.8.1
18-
github.com/spf13/cobra v1.4.0
19-
github.com/spf13/viper v1.11.0
17+
github.com/sirupsen/logrus v1.9.0
18+
github.com/spf13/cobra v1.5.0
19+
github.com/spf13/viper v1.12.0
2020
github.com/vulcand/oxy v1.4.1
21-
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
21+
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
2222
gopkg.in/natefinch/lumberjack.v2 v2.0.0
2323
)
2424

@@ -29,46 +29,45 @@ require (
2929
github.com/go-playground/locales v0.14.0 // indirect
3030
github.com/go-playground/universal-translator v0.18.0 // indirect
3131
github.com/go-playground/validator/v10 v10.11.0 // indirect
32-
github.com/golang/protobuf v1.5.2 // indirect
32+
github.com/goccy/go-json v0.9.11 // indirect
3333
github.com/hashicorp/hcl v1.0.0 // indirect
34-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
34+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
3535
github.com/json-iterator/go v1.1.12 // indirect
36-
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
36+
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
3737
github.com/leodido/go-urn v1.2.1 // indirect
3838
github.com/libdns/libdns v0.2.1 // indirect
3939
github.com/magiconair/properties v1.8.6 // indirect
4040
github.com/mailgun/timetools v0.0.0-20170619190023-f3a7b8ffff47 // indirect
41-
github.com/mattn/go-isatty v0.0.14 // indirect
42-
github.com/mholt/acmez v1.0.2 // indirect
43-
github.com/miekg/dns v1.1.49 // indirect
41+
github.com/mattn/go-isatty v0.0.16 // indirect
42+
github.com/mholt/acmez v1.0.4 // indirect
43+
github.com/miekg/dns v1.1.50 // indirect
4444
github.com/mitchellh/mapstructure v1.5.0 // indirect
4545
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4646
github.com/modern-go/reflect2 v1.0.2 // indirect
4747
github.com/pelletier/go-toml v1.9.5 // indirect
48-
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
49-
github.com/phuslu/iploc v1.0.20220429 // indirect
48+
github.com/pelletier/go-toml/v2 v2.0.3 // indirect
49+
github.com/phuslu/iploc v1.0.20220730 // indirect
5050
github.com/segmentio/fasthash v1.0.3 // indirect
51-
github.com/spf13/afero v1.8.2 // indirect
51+
github.com/spf13/afero v1.9.2 // indirect
5252
github.com/spf13/cast v1.5.0 // indirect
5353
github.com/spf13/jwalterweatherman v1.1.0 // indirect
5454
github.com/spf13/pflag v1.0.5 // indirect
55-
github.com/subosito/gotenv v1.2.0 // indirect
55+
github.com/subosito/gotenv v1.4.1 // indirect
5656
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
5757
github.com/ugorji/go/codec v1.2.7 // indirect
58-
go.uber.org/atomic v1.9.0 // indirect
58+
go.uber.org/atomic v1.10.0 // indirect
5959
go.uber.org/multierr v1.8.0 // indirect
60-
go.uber.org/zap v1.21.0 // indirect
61-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
62-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
63-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
60+
go.uber.org/zap v1.22.0 // indirect
61+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
62+
golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect
63+
golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
6464
golang.org/x/text v0.3.7 // indirect
65-
golang.org/x/tools v0.1.10 // indirect
66-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
67-
google.golang.org/protobuf v1.28.0 // indirect
68-
gopkg.in/ini.v1 v1.66.4 // indirect
65+
golang.org/x/tools v0.1.12 // indirect
66+
google.golang.org/protobuf v1.28.1 // indirect
67+
gopkg.in/ini.v1 v1.67.0 // indirect
6968
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
7069
gopkg.in/yaml.v2 v2.4.0 // indirect
71-
gopkg.in/yaml.v3 v3.0.0 // indirect
70+
gopkg.in/yaml.v3 v3.0.1 // indirect
7271
)
7372

7473
replace github.com/vulcand/oxy => github.com/antoniomika/oxy v1.1.1-0.20210804032133-5924ea01c950

0 commit comments

Comments
 (0)