Skip to content

Commit 0aaa22b

Browse files
authored
Merge pull request #3704 from dtrudg/alma10ci-4.3
ci: update runners, distros, deps (release-4.3)
2 parents 2dfaa50 + 6bd1cae commit 0aaa22b

File tree

1 file changed

+10
-25
lines changed

1 file changed

+10
-25
lines changed

.circleci/config.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ executors:
2727
almalinux9:
2828
docker:
2929
- image: almalinux:9
30-
centosstream10:
30+
almalinux10:
3131
docker:
32-
- image: quay.io/centos/centos:stream10
33-
ubuntu2004:
34-
docker:
35-
- image: ubuntu:20.04
32+
- image: almalinux:10
3633
ubuntu2204:
3734
docker:
3835
- image: ubuntu:22.04
@@ -44,10 +41,10 @@ executors:
4441
- image: golangci/golangci-lint:v2.1
4542
ubuntu-machine:
4643
machine:
47-
image: ubuntu-2404:2024.05.1
44+
image: ubuntu-2404:2024.11.1
4845
ubuntu-machine-large:
4946
machine:
50-
image: ubuntu-2404:2024.05.1
47+
image: ubuntu-2404:2024.11.1
5148
resource_class: large
5249

5350
commands:
@@ -113,7 +110,7 @@ commands:
113110
- run:
114111
name: Install crun
115112
command: |-
116-
<<# parameters.sudo >>sudo <</ parameters.sudo >>curl -L -o /usr/local/bin/crun https://github.com/containers/crun/releases/download/1.14.4/crun-1.14.4-linux-amd64
113+
<<# parameters.sudo >>sudo <</ parameters.sudo >>curl -L -o /usr/local/bin/crun https://github.com/containers/crun/releases/download/1.21/crun-1.21-linux-amd64
117114
<<# parameters.sudo >>sudo <</ parameters.sudo >>chmod +x /usr/local/bin/crun
118115
- run:
119116
name: Install conmon
@@ -241,7 +238,7 @@ jobs:
241238
command: |-
242239
./mconfig -v -p /usr/local --without-libsubid
243240
make -C ./builddir all
244-
241+
245242
lint-source:
246243
executor: golangci-lint
247244
steps:
@@ -425,7 +422,7 @@ workflows:
425422
- build-rpm:
426423
matrix:
427424
parameters:
428-
e: ["almalinux8", "almalinux9"]
425+
e: ["almalinux8", "almalinux9", "almalinux10"]
429426
filters:
430427
branches:
431428
only:
@@ -435,19 +432,7 @@ workflows:
435432
- build-deb:
436433
matrix:
437434
parameters:
438-
e: ["ubuntu2004", "ubuntu2204", "ubuntu2404"]
439-
filters:
440-
branches:
441-
only:
442-
- main
443-
- /release-.*/
444-
445-
preview:
446-
jobs:
447-
- build-rpm:
448-
matrix:
449-
parameters:
450-
e: ["centosstream10"]
435+
e: ["ubuntu2204", "ubuntu2404"]
451436
filters:
452437
branches:
453438
only:
@@ -459,7 +444,7 @@ workflows:
459444
- build-rpm:
460445
matrix:
461446
parameters:
462-
e: ["almalinux8", "almalinux9"]
447+
e: ["almalinux8", "almalinux9", "almalinux10"]
463448
filters:
464449
branches:
465450
ignore: /.*/
@@ -469,7 +454,7 @@ workflows:
469454
- build-deb:
470455
matrix:
471456
parameters:
472-
e: ["ubuntu2004", "ubuntu2204", "ubuntu2404"]
457+
e: ["ubuntu2204", "ubuntu2404"]
473458
filters:
474459
branches:
475460
ignore: /.*/

0 commit comments

Comments
 (0)