Skip to content

Commit fa78fa6

Browse files
committed
Merge branch 'master' into cli-beta
2 parents a2b2869 + cdb2098 commit fa78fa6

2 files changed

Lines changed: 56 additions & 44 deletions

File tree

.circleci/config.yml

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44

55
version: 2.1
66

7-
8-
jobs:
9-
examples-regtest:
10-
docker:
11-
- image: &img public.ecr.aws/y7e8i2v6/cvt-image:2023.10.25-2197-cf04537
12-
resource_class: small
13-
working_directory: ~/repo
7+
commands:
8+
prepare:
9+
parameters:
10+
certora_cli_package:
11+
type: string
12+
1413
steps:
1514
- add_ssh_keys:
1615
fingerprints:
@@ -20,7 +19,7 @@ jobs:
2019

2120
- run:
2221
name: Get the current version
23-
command: pip3.11 install certora-cli
22+
command: pip3.11 install << parameters.certora_cli_package >>
2423

2524
- run:
2625
name: Get ConfRunnerInfra
@@ -33,6 +32,29 @@ jobs:
3332
command: |
3433
cd ~/
3534
git clone git@github.com:Certora/ExamplesRegtest.git
35+
36+
- when:
37+
condition:
38+
equal: [ certora-cli-beta, << parameters.certora_cli_package >>]
39+
steps:
40+
- run:
41+
name: Switch ExamplesRegtest to cli-beta
42+
command: |
43+
cd ~/ExamplesRegtest
44+
git switch cli-beta
45+
46+
jobs:
47+
examples-regtest:
48+
parameters:
49+
certora_cli_package:
50+
type: string
51+
docker:
52+
- image: &img public.ecr.aws/y7e8i2v6/cvt-image:2023.10.25-2197-cf04537
53+
resource_class: small
54+
working_directory: ~/repo
55+
steps:
56+
- prepare:
57+
certora_cli_package: << parameters.certora_cli_package >>
3658

3759
- run:
3860
name: Run Reg Test
@@ -47,46 +69,24 @@ jobs:
4769
- store_test_results:
4870
path: ~/repo
4971

50-
examples-regtest-beta:
72+
test-certoraMutate:
73+
parameters:
74+
certora_cli_package:
75+
type: string
5176
docker:
5277
- image: &img public.ecr.aws/y7e8i2v6/cvt-image:2023.10.25-2197-cf04537
5378
resource_class: small
5479
working_directory: ~/repo
5580
steps:
56-
- add_ssh_keys:
57-
fingerprints:
58-
- "a7:d9:8e:37:bd:7c:ef:3a:a6:9b:dc:4f:29:97:f9:6f"
59-
60-
- checkout
81+
- prepare:
82+
certora_cli_package: << parameters.certora_cli_package >>
6183

6284
- run:
63-
name: Get the current beta
64-
command: pip3.11 install certora-cli-beta
65-
66-
- run:
67-
name: Get ConfRunnerInfra
68-
command: |
69-
ssh-keyscan github.com >> ~/.ssh/known_hosts
70-
pip3.11 install git+ssh://git@github.com/Certora/ConfRunnerInfra.git
71-
72-
- run:
73-
name: Get ExamplesRegtest
74-
command: |
75-
cd ~/
76-
git clone git@github.com:Certora/ExamplesRegtest.git
77-
cd ExamplesRegtest
78-
git switch cli-beta
79-
80-
- run:
81-
name: Run Reg Test
85+
name: Test certoraMutate
8286
command: |
8387
cd ~/ExamplesRegtest
84-
python3.11 RunNightlyTest.py --examples_repo_path ../repo
85-
86-
- store_artifacts:
87-
path: Report.csv
88-
destination: reports
89-
88+
python3.11 RunMutationTest.py --examples_repo_path ../repo
89+
9090
- store_test_results:
9191
path: ~/repo
9292

@@ -113,12 +113,18 @@ workflows:
113113
only:
114114
- master
115115
jobs:
116-
- examples-regtest
116+
- examples-regtest:
117+
certora_cli_package: certora-cli
118+
- test-certoraMutate:
119+
certora_cli_package: certora-cli
117120

118121
examples-manual:
119122
when: << pipeline.parameters.run_regtest >>
120123
jobs:
121-
- examples-regtest
124+
- examples-regtest:
125+
certora_cli_package: certora-cli
126+
- test-certoraMutate:
127+
certora_cli_package: certora-cli
122128

123129
examples-nightly-beta:
124130
triggers:
@@ -129,9 +135,15 @@ workflows:
129135
only:
130136
- cli-beta
131137
jobs:
132-
- examples-regtest-beta
138+
- examples-regtest:
139+
certora_cli_package: certora-cli-beta
140+
- test-certoraMutate:
141+
certora_cli_package: certora-cli-beta
133142

134143
examples-manual-beta:
135144
when: << pipeline.parameters.run_regtest_beta >>
136145
jobs:
137-
- examples-regtest-beta
146+
- examples-regtest:
147+
certora_cli_package: certora-cli-beta
148+
- test-certoraMutate:
149+
certora_cli_package: certora-cli-beta

DEFI/LiquidityPool/mutation.mconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"gambit": {
33
"filename" : "contracts/Pool.sol",
44
"num_mutants": 30
5-
},
5+
}
66
}

0 commit comments

Comments
 (0)