Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add build jobs that run on ubuntu 2204 #15754

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 >>
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading