Skip to content

Commit

Permalink
Merge pull request #327 from starkware-libs/yoni/merge-main-v0.13.2-i…
Browse files Browse the repository at this point in the history
…nto-main-1722857090

Merge main-v0.13.2 into main
  • Loading branch information
Yoni-Starkware authored Aug 5, 2024
2 parents 51e19e3 + 15f7982 commit fa2ecf4
Show file tree
Hide file tree
Showing 41 changed files with 196 additions and 174 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/blockifier_ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
name: Blockifier-CI

# TODO(Dori, 15/8/2024): Split this job, so the feature-less build doesn't run on every push to main
# branches.
on:
push:
branches:
- main
- main-v[0-9].**
tags:
- v[0-9].**
paths:
- 'crates/blockifier/**'
- 'crates/native_blockifier/**'
- 'build_native_blockifier_in_docker.sh'
- 'scripts/build_native_blockifier.sh'

pull_request:
types:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,14 @@ jobs:
uses: upsidr/merge-gatekeeper@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
timeout: 1200
ignored: "code-review/reviewable"

- name: Run Merge Gatekeeper in Merge Queue
if: github.event_name == 'merge_group'
uses: upsidr/merge-gatekeeper@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{github.ref}}
timeout: 1200
ignored: "code-review/reviewable"
112 changes: 56 additions & 56 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ byteorder = "1.4.3"
bytes = "1"
cached = "0.44.0"
cairo-felt = "0.9.1"
cairo-lang-casm = "2.7.0-rc.3"
cairo-lang-runner = "2.7.0-rc.3"
cairo-lang-sierra = "=2.7.0-rc.3"
cairo-lang-starknet-classes = "2.7.0-rc.3"
cairo-lang-utils = "2.7.0-rc.3"
cairo-vm = "=1.0.0-rc5"
cairo-lang-casm = "2.7.0"
cairo-lang-runner = "2.7.0"
cairo-lang-sierra = "=2.7.0"
cairo-lang-starknet-classes = "2.7.0"
cairo-lang-utils = "2.7.0"
cairo-vm = "=1.0.0-rc6"
camelpaste = "0.1.0"
chrono = "0.4.26"
clap = "4.3.10"
Expand Down Expand Up @@ -121,6 +121,7 @@ num-traits = "0.2.15"
once_cell = "1.19.0"
os_info = "3.6.0"
page_size = "0.6.0"
papyrus_config = { path = "crates/papyrus_config", version = "0.4.0-rc.0" }
parity-scale-codec = "=3.6.9"
parity-scale-codec-derive = "=3.6.9"
paste = "1.0.15"
Expand Down
Loading

0 comments on commit fa2ecf4

Please sign in to comment.