Skip to content

Commit f912aa3

Browse files
committed
BUILD/MEDIUM: go: upgrade golang to 1.22
1 parent e8c801e commit f912aa3

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

.gitlab-ci.yml

Lines changed: 16 additions & 15 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
@@ -76,7 +77,7 @@ build:
7677
- build
7778
image:
7879
name: $CI_REGISTRY_GO/golang:$GO_VERSION
79-
entrypoint: [ "" ]
80+
entrypoint: [""]
8081
tags:
8182
- go
8283
script:
@@ -93,10 +94,10 @@ build:
9394
paths:
9495
- build
9596
image:
96-
name: $CI_REGISTRY_GO/docker:stable
97-
entrypoint: [ "" ]
97+
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION
98+
entrypoint: [""]
9899
services:
99-
- name: $CI_REGISTRY_GO/docker:24.0-dind
100+
- name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
100101
alias: docker
101102
variables:
102103
LOCAL_IP_ADDRESS: docker
@@ -116,41 +117,41 @@ HAProxy_2_1:
116117
extends: .e2e
117118
parallel:
118119
matrix:
119-
- TESTPART: [ "1/2", "2/2" ]
120+
- TESTPART: ["1/2", "2/2"]
120121
HAPROXY_VERSION: "2.1"
121122
HAProxy_2_2:
122123
extends: .e2e
123124
parallel:
124125
matrix:
125-
- TESTPART: [ "1/2", "2/2" ]
126+
- TESTPART: ["1/2", "2/2"]
126127
HAPROXY_VERSION: "2.2"
127128
HAProxy_2_3:
128129
extends: .e2e
129130
parallel:
130131
matrix:
131-
- TESTPART: [ "1/2", "2/2" ]
132+
- TESTPART: ["1/2", "2/2"]
132133
HAPROXY_VERSION: "2.3"
133134
HAProxy_2_4:
134135
extends: .e2e
135136
parallel:
136137
matrix:
137-
- TESTPART: [ "1/2", "2/2" ]
138+
- TESTPART: ["1/2", "2/2"]
138139
HAPROXY_VERSION: "2.4"
139140
HAProxy_2_5:
140141
extends: .e2e
141142
parallel:
142143
matrix:
143-
- TESTPART: [ "1/2", "2/2" ]
144+
- TESTPART: ["1/2", "2/2"]
144145
HAPROXY_VERSION: "2.5"
145146
HAProxy_2_6:
146147
extends: .e2e
147148
parallel:
148149
matrix:
149-
- TESTPART: [ "1/2", "2/2" ]
150+
- TESTPART: ["1/2", "2/2"]
150151
HAPROXY_VERSION: "2.6"
151152
HAProxy_2_7:
152153
extends: .e2e
153154
parallel:
154155
matrix:
155-
- TESTPART: [ "1/2", "2/2" ]
156+
- TESTPART: ["1/2", "2/2"]
156157
HAPROXY_VERSION: "2.7"

e2e/libs/resource_client.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ function resource_put() {
3636
}
3737

3838
function resource_delete() {
39-
local endpoint; endpoint="$1"; shift
39+
local endpoint; endpoint="$1"; shift
4040
local qs_params; qs_params="$1"
4141

42-
run dpa_curl DELETE "$endpoint?$qs_params&version=$(version)" "$data"
42+
run dpa_curl DELETE "$endpoint?$qs_params&version=$(version)"
4343
assert_success
4444
dpa_curl_status_body '$output'
4545
}

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)