Skip to content

Commit

Permalink
Merge branch 'main' into use-standard-felt
Browse files Browse the repository at this point in the history
  • Loading branch information
Oppen committed Oct 18, 2023
2 parents 2219862 + f434823 commit f447b91
Show file tree
Hide file tree
Showing 34 changed files with 953 additions and 41 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/cairo_1_programs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Cairo 1 programs execution

on:
push:
branches: [ main ]
pull_request:
branches: [ '**' ]

jobs:
run:
name: Execute programs
runs-on: ubuntu-22.04
steps:
- name: Install Rust toolchain
uses: dtolnay/[email protected]
- name: Set up Cargo cache
uses: Swatinem/rust-cache@v2
- name: Checkout
uses: actions/checkout@v3
- name: install corelib
run: cd cairo1-run/ && make deps
- name: Run tests
run: cd cairo1-run/ && make test
- name: Run cairo 1 programs
run: cd cairo1-run/ && make run
21 changes: 19 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
fail-fast: false
matrix:
special_features: [""]
target: [ test#1, test#2, test-no_std, test-wasm ]
target: [ test#1, test#2, test#3, test#4, test-no_std, test-wasm ]
name: Run tests
runs-on: ubuntu-22.04
steps:
Expand All @@ -234,6 +234,11 @@ jobs:
with:
tool: [email protected],cargo-llvm-cov,wasm-pack

- name: Install cairo 1 dependencies for running programs
run: |
cd cairo1-run
make deps
- name: Run ${{ matrix.target }}
run: |
# this splits the `test#1` into `test` and `1`
Expand All @@ -244,7 +249,7 @@ jobs:
case ${NAME} in
'test')
cargo llvm-cov nextest --lcov --output-path lcov-${{ matrix.target }}-${{ matrix.special_features }}.info \
--partition count:${PARTITION}/2 \
--partition count:${PARTITION}/4 \
--workspace --features "cairo-1-hints, test_utils, ${{ matrix.special_features }}"
;;
'test-no_std')
Expand Down Expand Up @@ -411,6 +416,18 @@ jobs:
path: lcov-test#2-.info
key: codecov-cache-test#2--${{ github.sha }}
fail-on-cache-miss: true
- name: Fetch results for tests with stdlib (part. 3)
uses: actions/cache/restore@v3
with:
path: lcov-test#3-.info
key: codecov-cache-test#3--${{ github.sha }}
fail-on-cache-miss: true
- name: Fetch results for tests with stdlib (part. 4)
uses: actions/cache/restore@v3
with:
path: lcov-test#4-.info
key: codecov-cache-test#4--${{ github.sha }}
fail-on-cache-miss: true
- name: Fetch results for tests without stdlib
uses: actions/cache/restore@v3
with:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ cairo-vm-pypy-env/*
/cairo2/
/cairo-lang/
*.tar

cairo1-run/corelib/
cairo-vm-cli/air_input.pub
ensure-no_std/Cargo.lock

!vm/src/tests/cairo_pie_test_output.json
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

#### Upcoming Changes

* feat: Implement a CLI to run cairo programs [#1370](https://github.com/lambdaclass/cairo-vm/pull/1370)

* fix: Fix string code of `BLAKE2S_ADD_UINT256` hint [#1454](https://github.com/lambdaclass/cairo-vm/pull/1454)

#### [0.9.0] - 2023-10-03

* fix: Default to empty attributes vector when the field is missing from the program JSON [#1450](https://github.com/lambdaclass/cairo-vm/pull/1450)

* fix: Change serialization of CairoPieMemory to match Python's binary format [#1447](https://github.com/lambdaclass/cairo-vm/pull/1447)

* fix: Remove Deserialize derive from CairoPie and fix Serialize implementation to match Python's [#1444](https://github.com/lambdaclass/cairo-vm/pull/1444)
Expand All @@ -14,7 +22,7 @@

* feat: Added a differential fuzzer for programs with whitelisted hints [#1358](https://github.com/lambdaclass/cairo-vm/pull/1358)

* fix: Change return type of `get_execution_resources` to `RunnerError` [#1398](https://github.com/lambdaclass/cairo-vm/pull/1398)
* fix(breaking): Change return type of `get_execution_resources` to `RunnerError` [#1398](https://github.com/lambdaclass/cairo-vm/pull/1398)

* Don't build wasm-demo in `build` target + add ci job to run the wasm demo [#1393](https://github.com/lambdaclass/cairo-vm/pull/1393)

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to CONTRIBUTING.md
# Contributing to the Cairo VM

First off, thanks for taking the time to contribute! ❤️

Expand Down
Loading

0 comments on commit f447b91

Please sign in to comment.