Skip to content

Commit ebea56a

Browse files
committed
BUILD/MEDIUM: go: upgrade to go 1.18
1 parent da9db0c commit ebea56a

File tree

8 files changed

+12
-21
lines changed

8 files changed

+12
-21
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99

10-
- name: Set up Go 1.17
10+
- name: Set up Go 1.18
1111
uses: actions/setup-go@v1
1212
with:
13-
go-version: 1.17
13+
go-version: 1.18
1414
id: go
1515

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

.github/workflows/e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: Downloading required packages
1414
run: sudo apt-get install bats
15-
- name: Set up Go 1.17
15+
- name: Set up Go 1.18
1616
uses: actions/setup-go@v1
1717
with:
18-
go-version: 1.17
18+
go-version: 1.18
1919
- run: make e2e
2020
env:
2121
HAPROXY_VERSION: ${{ matrix.haproxy_version }}

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010
diff:
1111
stage: lint
1212
image:
13-
name: $CI_REGISTRY_GO/docker:stable-go1.17
13+
name: $CI_REGISTRY_GO/docker:stable-go1.18
1414
entrypoint: [ "" ]
1515
services:
1616
- name: $CI_REGISTRY_GO/docker:20.10.5-dind
@@ -34,13 +34,13 @@ golangci-lint:
3434
paths:
3535
- build
3636
image:
37-
name: $CI_REGISTRY_GO/golangci/golangci-lint:v1.21.0
38-
entrypoint: [ "" ]
37+
name: $CI_REGISTRY_GO/lint:1.46.2
38+
entrypoint: [""]
3939
tags:
4040
- go
4141
script:
4242
- golangci-lint cache clean && go clean -modcache -cache -i
43-
- golangci-lint run -v --color always --timeout 120s
43+
- golangci-lint run --timeout 5m --color always --max-issues-per-linter 0 --max-same-issues 0
4444
only:
4545
- merge_requests
4646
- branches
@@ -62,7 +62,7 @@ build:
6262
paths:
6363
- build
6464
image:
65-
name: $CI_REGISTRY_GO/golang:1.17
65+
name: $CI_REGISTRY_GO/golang:1.18
6666
entrypoint: [ "" ]
6767
tags:
6868
- go

.golangci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,3 @@ issues:
3838
run:
3939
skip-dirs:
4040
- test
41-
42-
# golangci.com configuration
43-
# https://github.com/golangci/golangci/wiki/Configuration
44-
service:
45-
golangci-lint-version: 1.17.x # use the fixed version to not introduce new linters unexpectedly

.goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
before:
33
hooks:
44
- go mod download
5-
- go mod tidy -compat=1.17
5+
- go mod tidy
66
- make clean
77
- mkdir build/
88
builds:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
## Building the Data Plane API
1111

12-
In order to build the Data Plane API you need go 1.17 installed on your system with go modules support enabled, and execute the following steps:
12+
In order to build the Data Plane API you need go 1.18 installed on your system with go modules support enabled, and execute the following steps:
1313

1414
1\. Clone dataplaneapi repository
1515

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/haproxytech/dataplaneapi
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
202202
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
203203
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
204204
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
205-
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
206205
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
207-
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
208206
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
209207
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
210208
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -278,7 +276,6 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
278276
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
279277
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
280278
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
281-
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
282279
github.com/rs/cors v1.8.0 h1:P2KMzcFwrPoSjkF1WLRPsp3UMLyql8L4v9hQpVeK5so=
283280
github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM=
284281
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -392,7 +389,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
392389
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
393390
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
394391
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
395-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
396392
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
397393
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
398394
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=

0 commit comments

Comments
 (0)