@@ -115,16 +115,13 @@ commands:
115115 source "$BASH_ENV"
116116
117117 get_bindings_hashes :
118- description : " Get submodule and protostar-rust hashes "
118+ description : " Get submodule hash "
119119 steps :
120120 - run :
121- name : Get submodule and protostar-rust hashes
121+ name : Get submodule hash
122122 command : |
123123 git rev-parse HEAD:./cairo > /tmp/cairo-submodule-hash
124- shasum scripts/install_all_bindings.sh > /tmp/scripts-hash
125124 shasum scripts/install_cairo_bindings.sh >> /tmp/scripts-hash
126- shasum scripts/install_protostar_rust_bindings.sh >> /tmp/scripts-hash
127- find protostar-rust -type f -exec shasum {} \; | sort -k 2 > /tmp/protostar-rust-hashes
128125
129126 cairo_bindings_and_compiler :
130127 description : " Install cairo bindings"
@@ -135,27 +132,25 @@ commands:
135132 enum : ["linux", "mac"]
136133 steps :
137134 - restore_cache :
138- 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" }}
135+ key : bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
139136 - run :
140137 name : Install bindings and compile cairo-compile
141138 command : |
142- if [ -f ./cairo/target/debug/cairo-compile ] && [ -d ./cairo/target/wheels ] && [ -d ./protostar-rust/target/wheels ] ; then
139+ if [ -f ./cairo/target/debug/cairo-compile ] && [ -d ./cairo/target/wheels ]; then
143140 pip install $(find ./cairo/target/wheels -maxdepth 1 -type f -iname "cairo_python_bindings*")
144- pip install $(find ./protostar-rust/target/wheels -maxdepth 1 -type f -iname "rust_test_runner_bindings*")
145141 else
146- poetry run poe install_all_bindings prod
147- poetry run poe install_all_bindings
142+ poetry run poe install_cairo_bindings prod
143+ poetry run poe install_cairo_bindings
148144 pushd cairo
149- rustup override set nightly-2022-11-03
145+ rustup override set nightly-2023-06-01
150146 cargo build --bin cairo-compile
151147 popd
152148 fi
153149 - save_cache :
154- 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" }}
150+ key : bindings-<< parameters.platform >>-{{ checksum "/tmp/scripts-hash" }}-{{ checksum "/tmp/cairo-submodule-hash" }}-<< pipeline.parameters.poetry_version >>-py<< pipeline.parameters.python_version >>-{{ checksum "poetry.lock" }}
155151 paths :
156152 - ./cairo/target/debug/cairo-compile
157153 - ./cairo/target/wheels
158- - ./protostar-rust/target/wheels
159154 - patch_cairo_compiler
160155
161156 patch_cairo_compiler :
@@ -202,7 +197,7 @@ commands:
202197 enum : ["linux", "mac"]
203198 steps :
204199 - restore_cache :
205- 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" }}
200+ 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" }}
206201
207202 save_poetry_cache :
208203 parameters :
@@ -211,7 +206,7 @@ commands:
211206 enum : ["linux", "mac"]
212207 steps :
213208 - save_cache :
214- 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" }}
209+ 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" }}
215210 paths :
216211 - ~/.cache/pypoetry
217212 - ~/Library/Caches/pypoetry
0 commit comments