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 test rust command #2030

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
7b6708f
Support `get_builtin_costs`in runner facade
cptartur May 9, 2023
f1c44a1
Update gas test to use `get_builtin_costs`
cptartur May 9, 2023
c12ce7c
Merge branch 'master' into 1767-fix-gas-support
cptartur May 9, 2023
e1e2643
init
May 9, 2023
219c4b7
init
May 10, 2023
789fb51
bump cairo
May 10, 2023
f86da08
Merge branch 'master' into kb/1860-cairo-nightly
May 10, 2023
c782540
commented not working tests, updated scarb version in CLI
piotmag769 May 11, 2023
ecaf1ab
Correct scarb folder name in Github Actions step
abulenok May 12, 2023
a14fbe9
update cairo
May 15, 2023
b316067
Merge branch 'master' into kb/1860-cairo-nightly
May 15, 2023
47de893
fix merge
May 15, 2023
5988e03
Merge branch 'kb/1860-cairo-nightly' into kb/rust-test-runner
May 15, 2023
7f81331
make the structure of files more clear, reuse the exception code
May 15, 2023
781d6b6
allow to install all bindings at once
May 15, 2023
bfad1b5
add printing
May 15, 2023
0696c4e
fmt
May 15, 2023
b84ecbe
fix e2e
May 15, 2023
c5a81ff
fix ci
May 15, 2023
ea2aee7
didnt hit cmd+s
May 15, 2023
b744fe9
fix ci
May 15, 2023
3752e69
Merge branch 'master' into kb/1860-cairo-nightly
May 15, 2023
85a9293
Merge branch 'kb/1860-cairo-nightly' into kb/rust-test-runner
May 15, 2023
00c6f5f
Merge branch 'master' into kb/1860-cairo-nightly
May 15, 2023
761ddb5
Bump cairo bindings
May 15, 2023
d4fc684
init
May 15, 2023
461caf6
Merge branch 'kb/1860-cairo-nightly' into kb/rust-test-runner
May 15, 2023
6b1e396
Merge branch 'kb/rust-test-runner' into kb/1906-add-test-rust-command
May 15, 2023
dcaec0c
Merge branch 'master' into kb/1906-add-test-rust-command
May 16, 2023
d79c109
remove cairo1 from name
May 16, 2023
b7ce135
fix ci
May 16, 2023
1c85b71
fix failing test
May 16, 2023
7d96766
Merge branch 'master' into kb/1906-add-test-rust-command
May 17, 2023
57aca48
fix merge
May 17, 2023
11bd98c
Merge branch 'master' into kb/1906-add-test-rust-command
May 26, 2023
5625f24
Merge branch 'master' into kb/1906-add-test-rust-command
karol-bisztyga May 29, 2023
0b1ef91
address feeback etc
May 29, 2023
1f49f34
Merge branch 'master' into kb/1906-add-test-rust-command
May 29, 2023
55912c6
add blockifier submodule
May 29, 2023
2d7cae2
update ci config
May 29, 2023
b9980f4
fix config file
May 29, 2023
33d308b
fix dox
May 30, 2023
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
24 changes: 19 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,20 @@ commands:
command: |
env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s << pipeline.parameters.python_version >>
pyenv global << pipeline.parameters.python_version >>
HOMEBREW_NO_AUTO_UPDATE=1 brew install gmp
HOMEBREW_NO_AUTO_UPDATE=1 brew install gmp patchelf
- save_cache:
key: mac-python-gmp-<< pipeline.parameters.python_version >>
paths:
- ~/.pyenv/versions/<< pipeline.parameters.python_version >>
- /opt/homebrew/opt/gmp
- /opt/homebrew/opt/patchelf

install_linux_patchelf:
description: "Install patchelf using pip"
steps:
- run:
name: Install patchelf
command: pip install patchelf

ensure_poetry_version:
description: "Install poetry"
Expand Down Expand Up @@ -120,6 +128,7 @@ commands:
- run:
name: Get submodule and protostar-rust hashes
command: |
git rev-parse HEAD:./blockifier > /tmp/blockifier-submodule-hash
git rev-parse HEAD:./cairo > /tmp/cairo-submodule-hash
shasum scripts/install_all_bindings.sh > /tmp/scripts-hash
shasum scripts/install_cairo_bindings.sh >> /tmp/scripts-hash
Expand All @@ -135,7 +144,7 @@ commands:
enum: ["linux", "mac"]
steps:
- restore_cache:
key: bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
key: bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/blockifier-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
- run:
name: Install bindings and compile cairo-compile
command: |
Expand All @@ -151,7 +160,7 @@ commands:
popd
fi
- save_cache:
key: bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
key: bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/blockifier-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
paths:
- ./cairo/target/debug/cairo-compile
- ./cairo/target/wheels
Expand Down Expand Up @@ -181,6 +190,11 @@ commands:
equal: ["mac", << parameters.platform >>]
steps:
- install_python_and_gmp_mac
- when:
condition:
equal: ["linux", << parameters.platform >>]
steps:
- install_linux_patchelf
- ensure_poetry_version
- install_rust
- install_scarb
Expand All @@ -202,7 +216,7 @@ commands:
enum: ["linux", "mac"]
steps:
- restore_cache:
key: poetry-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-<< parameters.platform >>-{{ checksum "poetry.lock" }}-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}
key: poetry-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-<< parameters.platform >>-{{ checksum "poetry.lock" }}-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/blockifier-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}

save_poetry_cache:
parameters:
Expand All @@ -211,7 +225,7 @@ commands:
enum: ["linux", "mac"]
steps:
- save_cache:
key: poetry-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-<< parameters.platform >>-{{ checksum "poetry.lock" }}-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}
key: poetry-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-<< parameters.platform >>-{{ checksum "poetry.lock" }}-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-{{ checksum "/tmp/blockifier-submodule-hash" }}-{{ checksum "/tmp/protostar-rust-hashes" }}
paths:
- ~/.cache/pypoetry
- ~/Library/Caches/pypoetry
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "cairo"]
path = cairo
url = https://github.com/software-mansion-labs/cairo
[submodule "blockifier"]
path = blockifier
url = https://github.com/karol-bisztyga/blockifier.git
1 change: 1 addition & 0 deletions blockifier
Submodule blockifier added at 5a4c48
Loading