Skip to content

Commit 600e0df

Browse files
kemingykemingy
authored
fix: use ubuntu 22.04 for all the dind related tests (#1955)
* test context v1 Signed-off-by: Keming <[email protected]> * workflow dispatch Signed-off-by: Keming <[email protected]> * update cache and ginkgo version Signed-off-by: Keming <[email protected]> * test different port Signed-off-by: Keming <[email protected]> * run on 22.04 Signed-off-by: Keming <[email protected]> * run on 22.04 Signed-off-by: Keming <[email protected]> * use 24.04 for the rest explicitly Signed-off-by: Keming <[email protected]> --------- Signed-off-by: Keming <[email protected]>
1 parent e737022 commit 600e0df

File tree

5 files changed

+23
-156
lines changed

5 files changed

+23
-156
lines changed

‎.github/workflows/CI.yml

+10-72
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
- 'Makefile'
1717
- 'go.**'
1818
merge_group:
19+
workflow_dispatch:
1920

2021
concurrency:
2122
group: ${{ github.workflow }}-${{ github.ref }}
@@ -24,7 +25,7 @@ concurrency:
2425
jobs:
2526
typos-check:
2627
name: Spell Check with Typos
27-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-24.04
2829
steps:
2930
- name: Checkout Actions Repository
3031
uses: actions/checkout@v4
@@ -34,21 +35,12 @@ jobs:
3435
config: ./typos.toml
3536
lint:
3637
name: lint
37-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-24.04
3839
steps:
3940
- uses: actions/setup-go@v5
4041
with:
4142
go-version: 'stable'
4243
- uses: actions/checkout@v4
43-
- name: Cache Go modules
44-
uses: actions/cache@preview
45-
with:
46-
path: ~/go/pkg/mod
47-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
48-
restore-keys: |
49-
${{ runner.OS }}-build-${{ env.cache-name }}-
50-
${{ runner.OS }}-build-
51-
${{ runner.OS }}-
5244
- name: Add license
5345
run: |
5446
make addlicense && git add pkg cmd &&
@@ -67,7 +59,7 @@ jobs:
6759
ENVD_ANALYTICS: false
6860
strategy:
6961
matrix:
70-
os: [ubuntu-latest]
62+
os: [ubuntu-24.04]
7163
runs-on: ${{ matrix.os }}
7264
steps:
7365
- name: Check out code
@@ -76,15 +68,6 @@ jobs:
7668
uses: actions/setup-go@v5
7769
with:
7870
go-version: 'stable'
79-
- name: Cache Go modules
80-
uses: actions/cache@preview
81-
with:
82-
path: ~/go/pkg/mod
83-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
84-
restore-keys: |
85-
${{ runner.OS }}-build-${{ env.cache-name }}-
86-
${{ runner.OS }}-build-
87-
${{ runner.OS }}-
8871
- name: Verify mockgen
8972
run: |
9073
make generate && git add pkg &&
@@ -103,7 +86,7 @@ jobs:
10386
ENVD_ANALYTICS: false
10487
strategy:
10588
matrix:
106-
os: [ubuntu-latest]
89+
os: [ubuntu-22.04]
10790
runs-on: ${{ matrix.os }}
10891
steps:
10992
- name: Check out code
@@ -112,15 +95,6 @@ jobs:
11295
uses: actions/setup-go@v5
11396
with:
11497
go-version: 'stable'
115-
- name: Cache Go modules
116-
uses: actions/cache@preview
117-
with:
118-
path: ~/go/pkg/mod
119-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
120-
restore-keys: |
121-
${{ runner.OS }}-build-${{ env.cache-name }}-
122-
${{ runner.OS }}-build-
123-
${{ runner.OS }}-
12498
- uses: actions-ecosystem/action-get-latest-tag@v1
12599
id: get-latest-tag
126100
- name: e2e test
@@ -139,7 +113,7 @@ jobs:
139113
ENVD_ANALYTICS: false
140114
strategy:
141115
matrix:
142-
os: [ubuntu-latest]
116+
os: [ubuntu-22.04]
143117
runs-on: ${{ matrix.os }}
144118
steps:
145119
- name: Check out code
@@ -148,15 +122,6 @@ jobs:
148122
uses: actions/setup-go@v5
149123
with:
150124
go-version: 'stable'
151-
- name: Cache Go modules
152-
uses: actions/cache@preview
153-
with:
154-
path: ~/go/pkg/mod
155-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
156-
restore-keys: |
157-
${{ runner.OS }}-build-${{ env.cache-name }}-
158-
${{ runner.OS }}-build-
159-
${{ runner.OS }}-
160125
- uses: actions-ecosystem/action-get-latest-tag@v1
161126
id: get-latest-tag
162127
- name: e2e test
@@ -175,7 +140,7 @@ jobs:
175140
ENVD_ANALYTICS: false
176141
strategy:
177142
matrix:
178-
os: [ubuntu-latest]
143+
os: [ubuntu-22.04]
179144
runs-on: ${{ matrix.os }}
180145
steps:
181146
- name: Check out code
@@ -184,15 +149,6 @@ jobs:
184149
uses: actions/setup-go@v5
185150
with:
186151
go-version: 'stable'
187-
- name: Cache Go modules
188-
uses: actions/cache@preview
189-
with:
190-
path: ~/go/pkg/mod
191-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
192-
restore-keys: |
193-
${{ runner.OS }}-build-${{ env.cache-name }}-
194-
${{ runner.OS }}-build-
195-
${{ runner.OS }}-
196152
- uses: actions-ecosystem/action-get-latest-tag@v1
197153
id: get-latest-tag
198154
- name: e2e test
@@ -211,7 +167,7 @@ jobs:
211167
ENVD_ANALYTICS: false
212168
strategy:
213169
matrix:
214-
os: [ubuntu-latest]
170+
os: [ubuntu-22.04]
215171
runs-on: ${{ matrix.os }}
216172
steps:
217173
- name: Check out code
@@ -220,15 +176,6 @@ jobs:
220176
uses: actions/setup-go@v5
221177
with:
222178
go-version: 'stable'
223-
- name: Cache Go modules
224-
uses: actions/cache@preview
225-
with:
226-
path: ~/go/pkg/mod
227-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
228-
restore-keys: |
229-
${{ runner.OS }}-build-${{ env.cache-name }}-
230-
${{ runner.OS }}-build-
231-
${{ runner.OS }}-
232179
- uses: actions-ecosystem/action-get-latest-tag@v1
233180
id: get-latest-tag
234181
- name: e2e test
@@ -247,7 +194,7 @@ jobs:
247194
ENVD_ANALYTICS: false
248195
strategy:
249196
matrix:
250-
os: [ubuntu-latest, macos-latest]
197+
os: [ubuntu-24.04, macos-latest]
251198
runs-on: ${{ matrix.os }}
252199
steps:
253200
- name: Check out code
@@ -256,15 +203,6 @@ jobs:
256203
uses: actions/setup-go@v5
257204
with:
258205
go-version: 'stable'
259-
- name: Cache Go modules
260-
uses: actions/cache@preview
261-
with:
262-
path: ~/go/pkg/mod
263-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
264-
restore-keys: |
265-
${{ runner.OS }}-build-${{ env.cache-name }}-
266-
${{ runner.OS }}-build-
267-
${{ runner.OS }}-
268206
- name: Build
269207
run: make
270208

@@ -276,7 +214,7 @@ jobs:
276214
- e2e-lang
277215
- e2e-cli-v1
278216
- e2e-lang-v1
279-
runs-on: ubuntu-latest
217+
runs-on: ubuntu-24.04
280218
steps:
281219
- name: Check out code
282220
uses: actions/checkout@v4

‎.github/workflows/envd-lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- '**.ipynb'
1919
- 'Makefile'
2020
merge_group:
21+
workflow_dispatch:
2122

2223
concurrency:
2324
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/nightly.yml

-72
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ jobs:
2020
with:
2121
go-version: 'stable'
2222
- uses: actions/checkout@v4
23-
- name: Cache Go modules
24-
uses: actions/cache@preview
25-
with:
26-
path: ~/go/pkg/mod
27-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
28-
restore-keys: |
29-
${{ runner.OS }}-build-${{ env.cache-name }}-
30-
${{ runner.OS }}-build-
31-
${{ runner.OS }}-
3223
- name: Add license
3324
run: |
3425
make addlicense && git add pkg cmd &&
@@ -57,15 +48,6 @@ jobs:
5748
uses: actions/setup-go@v5
5849
with:
5950
go-version: 'stable'
60-
- name: Cache Go modules
61-
uses: actions/cache@preview
62-
with:
63-
path: ~/go/pkg/mod
64-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
65-
restore-keys: |
66-
${{ runner.OS }}-build-${{ env.cache-name }}-
67-
${{ runner.OS }}-build-
68-
${{ runner.OS }}-
6951
- name: Verify mockgen
7052
run: |
7153
make generate && git add pkg &&
@@ -94,15 +76,6 @@ jobs:
9476
uses: actions/setup-go@v5
9577
with:
9678
go-version: 'stable'
97-
- name: Cache Go modules
98-
uses: actions/cache@preview
99-
with:
100-
path: ~/go/pkg/mod
101-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
102-
restore-keys: |
103-
${{ runner.OS }}-build-${{ env.cache-name }}-
104-
${{ runner.OS }}-build-
105-
${{ runner.OS }}-
10679
- uses: actions-ecosystem/action-get-latest-tag@v1
10780
id: get-latest-tag
10881
- name: e2e test
@@ -131,15 +104,6 @@ jobs:
131104
uses: actions/setup-go@v5
132105
with:
133106
go-version: 'stable'
134-
- name: Cache Go modules
135-
uses: actions/cache@preview
136-
with:
137-
path: ~/go/pkg/mod
138-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
139-
restore-keys: |
140-
${{ runner.OS }}-build-${{ env.cache-name }}-
141-
${{ runner.OS }}-build-
142-
${{ runner.OS }}-
143107
- uses: actions-ecosystem/action-get-latest-tag@v1
144108
id: get-latest-tag
145109
- name: e2e test
@@ -205,15 +169,6 @@ jobs:
205169
uses: actions/setup-go@v5
206170
with:
207171
go-version: 'stable'
208-
- name: Cache Go modules
209-
uses: actions/cache@preview
210-
with:
211-
path: ~/go/pkg/mod
212-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
213-
restore-keys: |
214-
${{ runner.OS }}-build-${{ env.cache-name }}-
215-
${{ runner.OS }}-build-
216-
${{ runner.OS }}-
217172
- name: Build
218173
run: make
219174
e2e-doc:
@@ -233,15 +188,6 @@ jobs:
233188
uses: actions/setup-go@v5
234189
with:
235190
go-version: 'stable'
236-
- name: Cache Go modules
237-
uses: actions/cache@preview
238-
with:
239-
path: ~/go/pkg/mod
240-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
241-
restore-keys: |
242-
${{ runner.OS }}-build-${{ env.cache-name }}-
243-
${{ runner.OS }}-build-
244-
${{ runner.OS }}-
245191
- uses: actions-ecosystem/action-get-latest-tag@v1
246192
id: get-latest-tag
247193
- name: e2e doc test
@@ -270,15 +216,6 @@ jobs:
270216
uses: actions/setup-go@v5
271217
with:
272218
go-version: 'stable'
273-
- name: Cache Go modules
274-
uses: actions/cache@preview
275-
with:
276-
path: ~/go/pkg/mod
277-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
278-
restore-keys: |
279-
${{ runner.OS }}-build-${{ env.cache-name }}-
280-
${{ runner.OS }}-build-
281-
${{ runner.OS }}-
282219
- uses: actions-ecosystem/action-get-latest-tag@v1
283220
id: get-latest-tag
284221
- name: e2e test
@@ -344,15 +281,6 @@ jobs:
344281
uses: actions/setup-go@v5
345282
with:
346283
go-version: 'stable'
347-
- name: Cache Go modules
348-
uses: actions/cache@preview
349-
with:
350-
path: ~/go/pkg/mod
351-
key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }}
352-
restore-keys: |
353-
${{ runner.OS }}-build-${{ env.cache-name }}-
354-
${{ runner.OS }}-build-
355-
${{ runner.OS }}-
356284
- uses: actions-ecosystem/action-get-latest-tag@v1
357285
id: get-latest-tag
358286
- name: e2e doc test

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ require (
2929
github.com/moby/term v0.5.0
3030
github.com/morikuni/aec v1.0.0
3131
github.com/olekukonko/tablewriter v0.0.5
32-
github.com/onsi/ginkgo/v2 v2.19.0
33-
github.com/onsi/gomega v1.34.1
32+
github.com/onsi/ginkgo/v2 v2.22.2
33+
github.com/onsi/gomega v1.36.2
3434
github.com/opencontainers/go-digest v1.0.0
3535
github.com/opencontainers/image-spec v1.1.0
3636
github.com/pkg/errors v0.9.1
@@ -103,7 +103,7 @@ require (
103103
github.com/golang/protobuf v1.5.4 // indirect
104104
github.com/golang/snappy v0.0.4 // indirect
105105
github.com/google/go-cmp v0.6.0 // indirect
106-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
106+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
107107
github.com/google/s2a-go v0.1.7 // indirect
108108
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
109109
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -204,7 +204,7 @@ require (
204204
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
205205
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
206206
google.golang.org/grpc v1.67.0 // indirect
207-
google.golang.org/protobuf v1.35.1 // indirect
207+
google.golang.org/protobuf v1.36.1 // indirect
208208
gopkg.in/ini.v1 v1.67.0 // indirect
209209
gopkg.in/warnings.v0 v0.1.2 // indirect
210210
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)