@@ -11,10 +11,6 @@ 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-2
17- default : " solbuildpackpusher/solidity-buildpack-deps@sha256:877fcc2589779f8245770711d10db92eda97d338dae76b6a9f27dde1a41b3aa0"
1814 ubuntu-2404-docker-image :
1915 type : string
2016 # solbuildpackpusher/solidity-buildpack-deps:ubuntu2404-3
@@ -30,8 +26,8 @@ parameters:
3026 emscripten-docker-image :
3127 type : string
3228 # NOTE: Please remember to update the `scripts/build_emscripten.sh` whenever the hash of this image changes.
33- # solbuildpackpusher/solidity-buildpack-deps:emscripten-20
34- default : " solbuildpackpusher/solidity-buildpack-deps@sha256:98f963ed799a0d206ef8e7b5475f847e0dea53b7fdea9618bbc6106a62730bd2 "
29+ # solbuildpackpusher/solidity-buildpack-deps:emscripten-21
30+ default : " solbuildpackpusher/solidity-buildpack-deps@sha256:fc53d68a4680ffa7d5f70164e13a903478964f15bcc07434d74833a05f4fbc19 "
3531 evm-version :
3632 type : string
3733 default : prague
@@ -198,6 +194,19 @@ commands:
198194 fi
199195 echo -n "$CIRCLE_SHA1" > commit_hash.txt
200196
197+ install_and_check_minimum_requirements :
198+ parameters :
199+ compiler :
200+ description : " Compiler to check: gcc or clang"
201+ type : enum
202+ enum :
203+ - gcc
204+ - clang
205+ steps :
206+ - run :
207+ name : Install and check minimum requirements
208+ command : scripts/ci/install_and_check_minimum_requirements.sh "--<< parameters.compiler >>"
209+
201210 run_build :
202211 steps :
203212 - run :
@@ -560,42 +569,6 @@ defaults:
560569 MAKEFLAGS : -j 10
561570 CPUs : 10
562571
563- - base_ubuntu2204 : &base_ubuntu2204
564- docker :
565- - image : << pipeline.parameters.ubuntu-2204-docker-image >>
566- environment : &base_ubuntu2204_env
567- TERM : xterm
568- CC : gcc
569- CXX : g++
570- MAKEFLAGS : -j 3
571- CPUs : 3
572-
573- - base_ubuntu2204_large : &base_ubuntu2204_large
574- << : *base_ubuntu2204
575- resource_class : large
576- environment : &base_ubuntu2204_large_env
577- << : *base_ubuntu2204_env
578- MAKEFLAGS : -j 5
579- CPUs : 5
580-
581- - base_ubuntu2204_clang : &base_ubuntu2204_clang
582- docker :
583- - image : << pipeline.parameters.ubuntu-2204-docker-image >>
584- environment : &base_ubuntu2204_clang_env
585- TERM : xterm
586- CC : clang
587- CXX : clang++
588- MAKEFLAGS : -j 3
589- CPUs : 3
590-
591- - base_ubuntu2204_clang_large : &base_ubuntu2204_clang_large
592- << : *base_ubuntu2204_clang
593- resource_class : large
594- environment : &base_ubuntu2204_clang_large_env
595- << : *base_ubuntu2204_clang_env
596- MAKEFLAGS : -j 5
597- CPUs : 5
598-
599572 - base_ubuntu2404 : &base_ubuntu2404
600573 docker :
601574 - image : << pipeline.parameters.ubuntu-2404-docker-image >>
@@ -1103,23 +1076,41 @@ jobs:
11031076 - solc/solc-static-linux
11041077 - matrix_notify_failure_unless_pr
11051078
1106- b_ubu_2204 :
1107- << : *base_ubuntu2204_large
1079+ b_ubu_min_req :
1080+ << : *base_ubuntu2404_large
11081081 steps :
11091082 - checkout
1083+ - install_and_check_minimum_requirements :
1084+ compiler : gcc
11101085 - run_build
1086+ - store_artifacts_solc
1087+ - persist_executables_to_workspace
11111088 - matrix_notify_failure_unless_pr
1089+ - build
11121090
1113- b_ubu_2204_clang :
1114- << : *base_ubuntu2204_clang_large
1091+ b_ubu_min_req_clang :
1092+ << : *base_ubuntu2404_clang_large
11151093 environment :
1116- << : *base_ubuntu2204_clang_large_env
1094+ << : *base_ubuntu2404_clang_large_env
11171095 MAKEFLAGS : -j 10
11181096 steps :
11191097 - checkout
1098+ - install_and_check_minimum_requirements :
1099+ compiler : clang
11201100 - run_build
11211101 - matrix_notify_failure_unless_pr
11221102
1103+ t_ubu_min_req_soltest :
1104+ << : *base_ubuntu2404_large
1105+ parallelism : 20
1106+ environment :
1107+ << : *base_ubuntu2404_large_env
1108+ EVM : << pipeline.parameters.evm-version >>
1109+ EOF_VERSION : 0
1110+ OPTIMIZE : 0
1111+ steps :
1112+ - soltest
1113+
11231114 b_ubu_ossfuzz : &b_ubu_ossfuzz
11241115 << : *base_ubuntu_clang_large
11251116 steps :
@@ -1893,8 +1884,14 @@ workflows:
18931884 # build-only
18941885 - b_docs : *requires_nothing
18951886 - b_ubu_ossfuzz : *requires_nothing
1896- - b_ubu_2204 : *requires_nothing
1897- - b_ubu_2204_clang : *requires_nothing
1887+
1888+ # build and test with minimum supported versions of dependencies
1889+ - b_ubu_min_req_clang : *requires_nothing
1890+ - b_ubu_min_req : *requires_nothing
1891+ - t_ubu_min_req_soltest :
1892+ << : *on_all_tags_and_branches
1893+ requires :
1894+ - b_ubu_min_req
18981895
18991896 # OS/X build and tests
19001897 - b_osx : *requires_nothing
0 commit comments