Skip to content

Commit 3649103

Browse files
committed
Switch most external tests to use native compiler built by b_ubu_static
1 parent f5830c4 commit 3649103

File tree

1 file changed

+24
-17
lines changed

1 file changed

+24
-17
lines changed

.circleci/config.yml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,11 @@ defaults:
396396
requires:
397397
- b_ubu_release
398398

399+
- workflow_ubuntu2004_static: &workflow_ubuntu2004_static
400+
<<: *workflow_trigger_on_tags
401+
requires:
402+
- b_ubu_static
403+
399404
- workflow_archlinux: &workflow_archlinux
400405
<<: *workflow_trigger_on_tags
401406
requires:
@@ -666,10 +671,11 @@ jobs:
666671
MAKEFLAGS: -j 10
667672

668673
b_ubu_static:
669-
# Runs 2x faster on large and 3x on xlarge but no other jobs depend on it we can live with medium.
670-
<<: *base_ubuntu2004
674+
# On large runs 2x faster than on medium. 3x on xlarge.
675+
<<: *base_ubuntu2004_xlarge
671676
environment:
672-
MAKEFLAGS: -j 5
677+
TERM: xterm
678+
MAKEFLAGS: -j 10
673679
CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
674680
steps:
675681
- checkout
@@ -678,6 +684,7 @@ jobs:
678684
name: strip binary
679685
command: strip build/solc/solc
680686
- store_artifacts: *artifacts_solc
687+
- persist_to_workspace: *artifacts_executables
681688
- gitter_notify_failure_unless_pr
682689

683690
b_ubu_codecov:
@@ -1303,42 +1310,42 @@ workflows:
13031310
compile_only: 1
13041311
nodejs_version: '14'
13051312
- t_ems_ext:
1306-
<<: *workflow_emscripten
1307-
name: t_ems_compile_ext_gnosis
1313+
<<: *workflow_ubuntu2004_static
1314+
name: t_native_compile_ext_gnosis
13081315
project: gnosis
1309-
binary_type: solcjs
1316+
binary_type: native
13101317
compile_only: 1
13111318
nodejs_version: '14'
13121319

13131320
# FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError
13141321
# and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.
13151322
#- t_ems_ext:
13161323
# <<: *workflow_emscripten
1317-
# name: t_ems_test_ext_gnosis
1324+
# name: t_native_test_ext_gnosis
13181325
# project: gnosis
1319-
# binary_type: solcjs
1326+
# binary_type: native
13201327
# # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
13211328
# nodejs_version: '12'
13221329
- t_ems_ext:
1323-
<<: *workflow_emscripten
1324-
name: t_ems_test_ext_gnosis_v2
1330+
<<: *workflow_ubuntu2004_static
1331+
name: t_native_test_ext_gnosis_v2
13251332
project: gnosis-v2
1326-
binary_type: solcjs
1333+
binary_type: native
13271334
# NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
13281335
nodejs_version: '12'
13291336
- t_ems_ext:
1330-
<<: *workflow_emscripten
1331-
name: t_ems_test_ext_zeppelin
1337+
<<: *workflow_ubuntu2004_static
1338+
name: t_native_test_ext_zeppelin
13321339
project: zeppelin
1333-
binary_type: solcjs
1340+
binary_type: native
13341341
# NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
13351342
nodejs_version: '16'
13361343
resource_class: large
13371344
- t_ems_ext:
1338-
<<: *workflow_emscripten
1339-
name: t_ems_test_ext_ens
1345+
<<: *workflow_ubuntu2004_static
1346+
name: t_native_test_ext_ens
13401347
project: ens
1341-
binary_type: solcjs
1348+
binary_type: native
13421349
# NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
13431350
nodejs_version: '10'
13441351

0 commit comments

Comments
 (0)