Skip to content

Commit fe1794d

Browse files
authored
Merge pull request #15754 from ethereum/ci_builds_on_2204
add build jobs that run on ubuntu 2204
2 parents e0a908d + 0ea9a40 commit fe1794d

File tree

1 file changed

+59
-0
lines changed

1 file changed

+59
-0
lines changed

.circleci/config.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ parameters:
1111
type: string
1212
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-26
1313
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1f387a77be889f65a2a25986a5c5eccc88cec23fabe6aeaf351790751145c81e"
14+
ubuntu-2204-docker-image:
15+
type: string
16+
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
17+
default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d61b0a4a49ac106e6747c1e8037882f1d421b537dba6c96c0a400ca105d85d4d"
1418
ubuntu-2404-docker-image:
1519
type: string
1620
# solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-2
@@ -551,6 +555,42 @@ defaults:
551555
MAKEFLAGS: -j 10
552556
CPUs: 10
553557

558+
- base_ubuntu2204: &base_ubuntu2204
559+
docker:
560+
- image: << pipeline.parameters.ubuntu-2204-docker-image >>
561+
environment: &base_ubuntu2204_env
562+
TERM: xterm
563+
CC: gcc
564+
CXX: g++
565+
MAKEFLAGS: -j 3
566+
CPUs: 3
567+
568+
- base_ubuntu2204_large: &base_ubuntu2204_large
569+
<<: *base_ubuntu2204
570+
resource_class: large
571+
environment: &base_ubuntu2204_large_env
572+
<<: *base_ubuntu2204_env
573+
MAKEFLAGS: -j 5
574+
CPUs: 5
575+
576+
- base_ubuntu2204_clang: &base_ubuntu2204_clang
577+
docker:
578+
- image: << pipeline.parameters.ubuntu-2204-docker-image >>
579+
environment: &base_ubuntu2204_clang_env
580+
TERM: xterm
581+
CC: clang
582+
CXX: clang++
583+
MAKEFLAGS: -j 3
584+
CPUs: 3
585+
586+
- base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
587+
<<: *base_ubuntu2204_clang
588+
resource_class: large
589+
environment: &base_ubuntu2204_clang_large_env
590+
<<: *base_ubuntu2204_clang_env
591+
MAKEFLAGS: -j 5
592+
CPUs: 5
593+
554594
- base_ubuntu2404: &base_ubuntu2404
555595
docker:
556596
- image: << pipeline.parameters.ubuntu-2404-docker-image >>
@@ -1068,6 +1108,23 @@ jobs:
10681108
- run_build
10691109
- matrix_notify_failure_unless_pr
10701110

1111+
b_ubu_2204:
1112+
<<: *base_ubuntu2204_large
1113+
steps:
1114+
- checkout
1115+
- run_build
1116+
- matrix_notify_failure_unless_pr
1117+
1118+
b_ubu_2204_clang:
1119+
<<: *base_ubuntu2204_clang_large
1120+
environment:
1121+
<<: *base_ubuntu2204_clang_large_env
1122+
MAKEFLAGS: -j 10
1123+
steps:
1124+
- checkout
1125+
- run_build
1126+
- matrix_notify_failure_unless_pr
1127+
10711128
b_ubu_ossfuzz: &b_ubu_ossfuzz
10721129
<<: *base_ubuntu_clang_large
10731130
steps:
@@ -1818,6 +1875,8 @@ workflows:
18181875
- b_docs: *requires_nothing
18191876
- b_ubu_cxx20: *requires_nothing
18201877
- b_ubu_ossfuzz: *requires_nothing
1878+
- b_ubu_2204: *requires_nothing
1879+
- b_ubu_2204_clang: *requires_nothing
18211880

18221881
# OS/X build and tests
18231882
- b_osx: *requires_nothing

0 commit comments

Comments
 (0)