From e3a38ae44f8437fce05fc3b01f44424cf4b12546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Thu, 2 Feb 2023 06:38:48 +0100 Subject: [PATCH] chore: update deps + Go 1.20 --- .drone.yml | 8 ++++---- build/docker/dcbot/dev/Dockerfile | 2 +- build/docker/dcbot/prod/Dockerfile | 2 +- cmd/dcbot/internal/appmode/appmode_test.go | 2 -- go.mod | 12 ++++++------ go.sum | 20 ++++++++++---------- internal/tools/go.mod | 2 +- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 086a45a..67e1b45 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: test steps: - name: test - image: golang:1.19 + image: golang:1.20 environment: TESTS_DB_DSN: postgres://postgres:dcbot@database:5432/dcbot?sslmode=disable commands: @@ -33,7 +33,7 @@ name: check-go-mod steps: - name: check go.mod - image: golang:1.19 + image: golang:1.20 commands: - make generate - go mod tidy @@ -77,7 +77,7 @@ platform: steps: - name: govulncheck - image: golang:1.19 + image: golang:1.20 commands: - make generate - go install golang.org/x/vuln/cmd/govulncheck@latest @@ -176,6 +176,6 @@ depends_on: - manifest --- kind: signature -hmac: 8e912975f84164f598437fb9485bccf8d3fdd7575309db9dc2229f733233b889 +hmac: ea520ec8f83d9395973ea2f54f3ca66f3a64095879a35adee0afff97a4930561 ... diff --git a/build/docker/dcbot/dev/Dockerfile b/build/docker/dcbot/dev/Dockerfile index 0054a8c..25abbc4 100644 --- a/build/docker/dcbot/dev/Dockerfile +++ b/build/docker/dcbot/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.20 as builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/build/docker/dcbot/prod/Dockerfile b/build/docker/dcbot/prod/Dockerfile index fae59ff..c692287 100644 --- a/build/docker/dcbot/prod/Dockerfile +++ b/build/docker/dcbot/prod/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.5-alpine3.17 as builder +FROM golang:1.20.0-alpine3.17 as builder WORKDIR /dcbot diff --git a/cmd/dcbot/internal/appmode/appmode_test.go b/cmd/dcbot/internal/appmode/appmode_test.go index 683f8a9..93e0fda 100644 --- a/cmd/dcbot/internal/appmode/appmode_test.go +++ b/cmd/dcbot/internal/appmode/appmode_test.go @@ -11,8 +11,6 @@ import ( // //nolint:tparallel func TestParse(t *testing.T) { - t.Parallel() - tests := []struct { name string input string diff --git a/go.mod b/go.mod index 38f0c77..0413e28 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitea.dwysokinski.me/twhelp/dcbot -go 1.19 +go 1.20 require ( github.com/bwmarrin/discordgo v0.27.0 @@ -11,11 +11,11 @@ require ( github.com/ory/dockertest/v3 v3.9.1 github.com/robfig/cron/v3 v3.0.1 github.com/stretchr/testify v1.8.1 - github.com/uptrace/bun v1.1.10 - github.com/uptrace/bun/dbfixture v1.1.10 - github.com/uptrace/bun/dialect/pgdialect v1.1.10 - github.com/uptrace/bun/driver/pgdriver v1.1.10 - github.com/urfave/cli/v2 v2.23.7 + github.com/uptrace/bun v1.1.11 + github.com/uptrace/bun/dbfixture v1.1.11 + github.com/uptrace/bun/dialect/pgdialect v1.1.11 + github.com/uptrace/bun/driver/pgdriver v1.1.11 + github.com/urfave/cli/v2 v2.24.2 go.uber.org/zap v1.24.0 ) diff --git a/go.sum b/go.sum index 50e5c91..0faeb4c 100644 --- a/go.sum +++ b/go.sum @@ -113,17 +113,17 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= -github.com/uptrace/bun v1.1.10 h1:wx80lg32mWlOV1gNvmPTbR9znt6A2fYvvURzU5dzSPE= -github.com/uptrace/bun v1.1.10/go.mod h1:pOWJSVU+W0jp3+cbn/TtHdcG/h+QxagECw4EYdKiaSw= -github.com/uptrace/bun/dbfixture v1.1.10 h1:fjxGQ7CFoIcbfBp3sAg3R6Ee4xaAYGgMTLMY2VergWE= -github.com/uptrace/bun/dbfixture v1.1.10/go.mod h1:cYs6r9hGlgnrh8mW0HYkhso3GMpP2/aY/FFQ45bj3Qw= -github.com/uptrace/bun/dialect/pgdialect v1.1.10 h1:H25ieb5OJV5ywvKvswF++wMTnePRaGRiSNkYCRXrQxc= -github.com/uptrace/bun/dialect/pgdialect v1.1.10/go.mod h1:leDSw/IC70/GYPIU3zC8fkOZpJaJ28f51OMT1VnZiY8= -github.com/uptrace/bun/driver/pgdriver v1.1.10 h1:xmabc3eG5rz8FadFF3GrQiGs5XvXlz6CJUMZhne+1sM= -github.com/uptrace/bun/driver/pgdriver v1.1.10/go.mod h1:krWrOAzJmroYDySsA6oNsJEVUmKl+ZBWLkGHphXUxqI= +github.com/uptrace/bun v1.1.11 h1:PVT+DHdLX13tIJaBoT0tkjh1TOWOybW/pz3TKiOB9lo= +github.com/uptrace/bun v1.1.11/go.mod h1:ysoB7l3gioKLBaZH9wKuJAoeBiOthb/hTyKdbXKcaxg= +github.com/uptrace/bun/dbfixture v1.1.11 h1:kYiwydXAMwLYKDjTqB7GhguribLfJpWN/VIraoIu1fc= +github.com/uptrace/bun/dbfixture v1.1.11/go.mod h1:tqtA92QYGFpLdhF0fh94Q/tIoocB2q9Zn9mOKSoXMSs= +github.com/uptrace/bun/dialect/pgdialect v1.1.11 h1:z1CLRQiYtTX1Usn2OEF7EtOBYeTFJiNdTgLuXE+AZZs= +github.com/uptrace/bun/dialect/pgdialect v1.1.11/go.mod h1:orzsx6UwNnSaTTELzLqc/XiWrR4k0Smid8Bchdg0mk4= +github.com/uptrace/bun/driver/pgdriver v1.1.11 h1:0oKNY3cBuIs6wHCJP2IpUw5wPoeUa8oIDEvIdei+sDI= +github.com/uptrace/bun/driver/pgdriver v1.1.11/go.mod h1:c5x3/2B63Vw876N1GjWJbqQOE3k68+8abMc428PKG18= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY= -github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/urfave/cli/v2 v2.24.2 h1:q1VA+ofZ8SWfEKB9xXHUD4QZaeI9e+ItEqSbfH2JBXk= +github.com/urfave/cli/v2 v2.24.2/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 75381ed..d7fb46b 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module gitea.dwysokinski.me/twhelp/dcbot/internal/tools -go 1.19 +go 1.20 require ( github.com/golangci/golangci-lint v1.50.1