Skip to content

Commit a7866a1

Browse files
committed
BUILD/MEDIUM: go: upgrade golang to 1.22
1 parent 14ab8aa commit a7866a1

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

.gitlab-ci.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ variables:
66
DOCKER_HOST: tcp://docker:2375
77
DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-debian
88
BATS_VERSION: v1.4.1
9-
GO_VERSION: '1.21'
9+
GO_VERSION: "1.22"
10+
DOCKER_VERSION: "26.0"
1011

1112
diff:
1213
stage: lint
1314
image:
14-
name: $CI_REGISTRY_GO/docker:stable-go$GO_VERSION
15-
entrypoint: [ "" ]
15+
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
16+
entrypoint: [""]
1617
services:
17-
- name: $CI_REGISTRY_GO/docker:20.10.5-dind
18+
- name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
1819
alias: docker
1920
tags:
2021
- go
@@ -75,7 +76,7 @@ build:
7576
- build
7677
image:
7778
name: $CI_REGISTRY_GO/golang:$GO_VERSION
78-
entrypoint: [ "" ]
79+
entrypoint: [""]
7980
tags:
8081
- go
8182
script:
@@ -92,10 +93,10 @@ build:
9293
paths:
9394
- build
9495
image:
95-
name: $CI_REGISTRY_GO/docker:stable
96-
entrypoint: [ "" ]
96+
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION
97+
entrypoint: [""]
9798
services:
98-
- name: $CI_REGISTRY_GO/docker:24.0-dind
99+
- name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
99100
alias: docker
100101
variables:
101102
LOCAL_IP_ADDRESS: docker
@@ -115,59 +116,59 @@ HAProxy_2_1:
115116
extends: .e2e
116117
parallel:
117118
matrix:
118-
- TESTPART: [ "1/2", "2/2" ]
119+
- TESTPART: ["1/2", "2/2"]
119120
HAPROXY_VERSION: "2.1"
120121
HAProxy_2_2:
121122
extends: .e2e
122123
parallel:
123124
matrix:
124-
- TESTPART: [ "1/2", "2/2" ]
125+
- TESTPART: ["1/2", "2/2"]
125126
HAPROXY_VERSION: "2.2"
126127
HAProxy_2_3:
127128
extends: .e2e
128129
parallel:
129130
matrix:
130-
- TESTPART: [ "1/2", "2/2" ]
131+
- TESTPART: ["1/2", "2/2"]
131132
HAPROXY_VERSION: "2.3"
132133
HAProxy_2_4:
133134
extends: .e2e
134135
parallel:
135136
matrix:
136-
- TESTPART: [ "1/2", "2/2" ]
137+
- TESTPART: ["1/2", "2/2"]
137138
HAPROXY_VERSION: "2.4"
138139
HAProxy_2_5:
139140
extends: .e2e
140141
parallel:
141142
matrix:
142-
- TESTPART: [ "1/2", "2/2" ]
143+
- TESTPART: ["1/2", "2/2"]
143144
HAPROXY_VERSION: "2.5"
144145
HAProxy_2_6:
145146
extends: .e2e
146147
parallel:
147148
matrix:
148-
- TESTPART: [ "1/2", "2/2" ]
149+
- TESTPART: ["1/2", "2/2"]
149150
HAPROXY_VERSION: "2.6"
150151
HAProxy_2_7:
151152
extends: .e2e
152153
parallel:
153154
matrix:
154-
- TESTPART: [ "1/2", "2/2" ]
155+
- TESTPART: ["1/2", "2/2"]
155156
HAPROXY_VERSION: "2.7"
156157
HAProxy_2_8:
157158
extends: .e2e
158159
parallel:
159160
matrix:
160-
- TESTPART: [ "1/2", "2/2" ]
161+
- TESTPART: ["1/2", "2/2"]
161162
HAPROXY_VERSION: "2.8"
162163
HAProxy_2_9:
163164
extends: .e2e
164165
parallel:
165166
matrix:
166-
- TESTPART: [ "1/2", "2/2" ]
167+
- TESTPART: ["1/2", "2/2"]
167168
HAPROXY_VERSION: "2.9"
168169
HAProxy_3_0:
169170
extends: .e2e
170171
parallel:
171172
matrix:
172-
- TESTPART: [ "1/2", "2/2" ]
173+
- TESTPART: ["1/2", "2/2"]
173174
HAPROXY_VERSION: "3.0"

e2e/libs/resource_client.bash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ function resource_put() {
3737
}
3838

3939
function resource_delete() {
40-
local endpoint; endpoint="$1"; shift
40+
local endpoint; endpoint="$1"; shift
4141
local qs_params; qs_params="$1"
42-
get_version
43-
run dpa_curl DELETE "$endpoint?$qs_params&version=${VERSION}" "$data"
42+
get_version
43+
run dpa_curl DELETE "$endpoint?$qs_params&version=${VERSION}"
4444
assert_success
4545
dpa_curl_status_body '$output'
4646
}

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.21
3+
go 1.22
44

55
require (
66
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5

0 commit comments

Comments
 (0)