Skip to content

Commit 48b7a57

Browse files
chore: Update Go version to 1.20 (#119)
1 parent 673a9b0 commit 48b7a57

File tree

8 files changed

+32
-28
lines changed

8 files changed

+32
-28
lines changed

.github/workflows/prerelease.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99

1010
env:
1111
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12-
GO_VERSION: '1.18'
1312
INTEGRATION: "mysql"
1413
ORIGINAL_REPO_NAME: ${{ github.event.repository.full_name }}
1514
REPO_FULL_NAME: ${{ github.event.repository.full_name }}
@@ -58,9 +57,9 @@ jobs:
5857
with:
5958
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
6059
- name: Install Go
61-
uses: actions/setup-go@v2
60+
uses: actions/setup-go@v3
6261
with:
63-
go-version: ${{env.GO_VERSION}}
62+
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
6463
- name: Running unit tests
6564
shell: pwsh
6665
run: |
@@ -81,9 +80,9 @@ jobs:
8180
fetch-depth: 1
8281
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
8382
- name: Install Go
84-
uses: actions/setup-go@v2
83+
uses: actions/setup-go@v3
8584
with:
86-
go-version: ${{env.GO_VERSION}}
85+
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
8786
- name: Login to DockerHub
8887
uses: docker/login-action@v1
8988
with:

.github/workflows/push_pr.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
TAG: "v0.0.0" # needed for goreleaser windows builds
1212
REPO_FULL_NAME: ${{ github.event.repository.full_name }}
1313
ORIGINAL_REPO_NAME: "newrelic/nri-mysql"
14-
GO_VERSION: '1.18'
1514
DOCKER_LOGIN_AVAILABLE: ${{ secrets.OHAI_DOCKER_HUB_ID }}
1615

1716
jobs:
@@ -76,9 +75,9 @@ jobs:
7675
with:
7776
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
7877
- name: Install Go
79-
uses: actions/setup-go@v2
78+
uses: actions/setup-go@v3
8079
with:
81-
go-version: ${{env.GO_VERSION}}
80+
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
8281
- name: Running unit tests
8382
shell: pwsh
8483
run: |
@@ -98,9 +97,9 @@ jobs:
9897
fetch-depth: 1
9998
path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
10099
- name: Install Go
101-
uses: actions/setup-go@v2
100+
uses: actions/setup-go@v3
102101
with:
103-
go-version: ${{env.GO_VERSION}}
102+
go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod"
104103
- name: Login to DockerHub
105104
if: ${{env.DOCKER_LOGIN_AVAILABLE}}
106105
uses: docker/login-action@v1

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 1.9.0 (2023-06-06)
8+
# Changed
9+
- Update Go version to 1.20
10+
711
## 1.8.1 (2022-06-27)
812
### Changed
913
- Bump dependencies

Dockerfile

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

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18-buster
1+
FROM golang:1.20-buster
22

33
ARG GH_VERSION='1.9.2'
44

go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/newrelic/nri-mysql
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/bitly/go-simplejson v0.5.0
7-
github.com/go-sql-driver/mysql v1.6.0
7+
github.com/go-sql-driver/mysql v1.7.1
88
github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible
9-
github.com/sirupsen/logrus v1.8.1
10-
github.com/stretchr/testify v1.7.5
9+
github.com/sirupsen/logrus v1.9.2
10+
github.com/stretchr/testify v1.8.4
1111
github.com/xeipuuv/gojsonschema v1.2.0
1212
)
1313

@@ -19,9 +19,10 @@ require (
1919
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
2020
github.com/pkg/errors v0.9.1 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
22+
github.com/stretchr/objx v0.5.0 // indirect
2223
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
2324
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
24-
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 // indirect
25+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
2526
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
2627
gopkg.in/yaml.v3 v3.0.1 // indirect
2728
)

go.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
88
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
1010
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
11+
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
12+
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
1113
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
1214
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
1315
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -24,13 +26,21 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
2426
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2527
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
2628
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
29+
github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
30+
github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
2731
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2832
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
33+
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
34+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
2935
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
3036
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
37+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3138
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3239
github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q=
3340
github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
41+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
42+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
43+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
3444
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
3545
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
3646
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -40,6 +50,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
4050
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4151
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 h1:V066+OYJ66oTjnhm4Yrn7SXIwSCiDQJxpBxmvqb1N1c=
4252
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
53+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
54+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4355
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4456
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
4557
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

tests/integration/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18 as builder
1+
FROM golang:1.20-buster as builder
22
ARG CGO_ENABLED=0
33
WORKDIR /go/src/github.com/newrelic/nri-mysql
44
COPY . .

0 commit comments

Comments
 (0)