Skip to content

Commit ce72134

Browse files
committed
Add CLI version of bytecode compare to existing CI jobs
1 parent c12971e commit ce72134

File tree

1 file changed

+38
-14
lines changed

1 file changed

+38
-14
lines changed

.circleci/config.yml

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -925,13 +925,19 @@ jobs:
925925
- checkout
926926
- attach_workspace:
927927
at: build
928-
- run: scripts/bytecodecompare/storebytecode.sh && cp -v report.txt bytecode-report-ubuntu.txt
928+
- run: mkdir test-cases/
929+
- run: cd test-cases && ../scripts/isolate_tests.py ../test/
930+
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json && mv -v report.txt ../bytecode-report-ubuntu-json.txt
931+
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli && mv -v report.txt ../bytecode-report-ubuntu-cli.txt
929932
- store_artifacts:
930-
path: report.txt
933+
path: bytecode-report-ubuntu-json.txt
934+
- store_artifacts:
935+
path: bytecode-report-ubuntu-cli.txt
931936
- persist_to_workspace:
932937
root: .
933938
paths:
934-
- bytecode-report-ubuntu.txt
939+
- bytecode-report-ubuntu-json.txt
940+
- bytecode-report-ubuntu-cli.txt
935941

936942
b_bytecode_osx:
937943
macos:
@@ -942,13 +948,19 @@ jobs:
942948
- checkout
943949
- attach_workspace:
944950
at: .
945-
- run: scripts/bytecodecompare/storebytecode.sh && cp -v report.txt bytecode-report-osx.txt
951+
- run: mkdir test-cases/
952+
- run: cd test-cases && ../scripts/isolate_tests.py ../test/
953+
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json && mv -v report.txt ../bytecode-report-osx-json.txt
954+
- run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli && mv -v report.txt ../bytecode-report-osx-cli.txt
955+
- store_artifacts:
956+
path: bytecode-report-osx-json.txt
946957
- store_artifacts:
947-
path: report.txt
958+
path: bytecode-report-osx-cli.txt
948959
- persist_to_workspace:
949960
root: .
950961
paths:
951-
- bytecode-report-osx.txt
962+
- bytecode-report-osx-json.txt
963+
- bytecode-report-osx-cli.txt
952964

953965
b_bytecode_win:
954966
executor:
@@ -961,15 +973,19 @@ jobs:
961973
- checkout
962974
- attach_workspace:
963975
at: build
964-
- run: python scripts\isolate_tests.py test\
965-
- run: python scripts\bytecodecompare\prepare_report.py build\solc\Release\solc.exe
966-
- run: cp report.txt bytecode-report-windows.txt
976+
- run: mkdir test-cases\
977+
- run: cd test-cases\ && python ..\scripts\isolate_tests.py ..\test\
978+
- run: cd test-cases\ && python ..\scripts\bytecodecompare\prepare_report.py ..\build\solc\Release\solc.exe --interface standard-json && move report.txt ..\bytecode-report-windows-json.txt
979+
- run: cd test-cases\ && python ..\scripts\bytecodecompare\prepare_report.py ..\build\solc\Release\solc.exe --interface cli && move report.txt ..\bytecode-report-windows-cli.txt
980+
- store_artifacts:
981+
path: bytecode-report-windows-json.txt
967982
- store_artifacts:
968-
path: report.txt
983+
path: bytecode-report-windows-cli.txt
969984
- persist_to_workspace:
970985
root: .
971986
paths:
972-
- bytecode-report-windows.txt
987+
- bytecode-report-windows-json.txt
988+
- bytecode-report-windows-cli.txt
973989

974990
b_bytecode_ems:
975991
docker:
@@ -980,9 +996,9 @@ jobs:
980996
- checkout
981997
- attach_workspace:
982998
at: emscripten_build/libsolc
983-
- run: scripts/bytecodecompare/storebytecode.sh && cp -v report.txt bytecode-report-emscripten.txt
999+
- run: scripts/bytecodecompare/storebytecode.sh && mv -v report.txt bytecode-report-emscripten.txt
9841000
- store_artifacts:
985-
path: report.txt
1001+
path: bytecode-report-emscripten.txt
9861002
- persist_to_workspace:
9871003
root: .
9881004
paths:
@@ -994,7 +1010,15 @@ jobs:
9941010
steps:
9951011
- attach_workspace:
9961012
at: .
997-
- run: diff --report-identical-files --from-file bytecode-report-emscripten.txt bytecode-report-ubuntu.txt bytecode-report-osx.txt bytecode-report-windows.txt
1013+
- run: |
1014+
diff --report-identical-files --from-file \
1015+
bytecode-report-emscripten.txt \
1016+
bytecode-report-ubuntu-json.txt \
1017+
bytecode-report-ubuntu-cli.txt \
1018+
bytecode-report-osx-json.txt \
1019+
bytecode-report-osx-cli.txt \
1020+
bytecode-report-windows-json.txt \
1021+
bytecode-report-windows-cli.txt
9981022
9991023
workflows:
10001024
version: 2

0 commit comments

Comments
 (0)