From 0ea9a40b82cd7ecad8f5d0fa44aa6f3d0206be9f Mon Sep 17 00:00:00 2001
From: clonker <1685266+clonker@users.noreply.github.com>
Date: Wed, 22 Jan 2025 18:14:17 +0100
Subject: [PATCH] ci: add build jobs that run on ubuntu 2204

---
 .circleci/config.yml | 59 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c24604c84e90..be04d2a6f997 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,6 +11,10 @@ parameters:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-26
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:1f387a77be889f65a2a25986a5c5eccc88cec23fabe6aeaf351790751145c81e"
+  ubuntu-2204-docker-image:
+    type: string
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d61b0a4a49ac106e6747c1e8037882f1d421b537dba6c96c0a400ca105d85d4d"
   ubuntu-2404-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-2
@@ -551,6 +555,42 @@ defaults:
         MAKEFLAGS: -j 10
         CPUs: 10
 
+  - base_ubuntu2204: &base_ubuntu2204
+      docker:
+        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
+      environment: &base_ubuntu2204_env
+        TERM: xterm
+        CC: gcc
+        CXX: g++
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2204_large: &base_ubuntu2204_large
+      <<: *base_ubuntu2204
+      resource_class: large
+      environment: &base_ubuntu2204_large_env
+        <<: *base_ubuntu2204_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
+  - base_ubuntu2204_clang: &base_ubuntu2204_clang
+      docker:
+        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
+      environment: &base_ubuntu2204_clang_env
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 3
+        CPUs: 3
+
+  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
+      <<: *base_ubuntu2204_clang
+      resource_class: large
+      environment: &base_ubuntu2204_clang_large_env
+        <<: *base_ubuntu2204_clang_env
+        MAKEFLAGS: -j 5
+        CPUs: 5
+
   - base_ubuntu2404: &base_ubuntu2404
       docker:
         - image: << pipeline.parameters.ubuntu-2404-docker-image >>
@@ -1068,6 +1108,23 @@ jobs:
       - run_build
       - matrix_notify_failure_unless_pr
 
+  b_ubu_2204:
+    <<: *base_ubuntu2204_large
+    steps:
+      - checkout
+      - run_build
+      - matrix_notify_failure_unless_pr
+
+  b_ubu_2204_clang:
+    <<: *base_ubuntu2204_clang_large
+    environment:
+      <<: *base_ubuntu2204_clang_large_env
+      MAKEFLAGS: -j 10
+    steps:
+      - checkout
+      - run_build
+      - matrix_notify_failure_unless_pr
+
   b_ubu_ossfuzz: &b_ubu_ossfuzz
     <<: *base_ubuntu_clang_large
     steps:
@@ -1818,6 +1875,8 @@ workflows:
       - b_docs: *requires_nothing
       - b_ubu_cxx20: *requires_nothing
       - b_ubu_ossfuzz: *requires_nothing
+      - b_ubu_2204: *requires_nothing
+      - b_ubu_2204_clang: *requires_nothing
 
       # OS/X build and tests
       - b_osx: *requires_nothing