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.

Sign up for GitHub

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

Jump to bottom

Use rev in Cargo.toml, update deps #68

Closed
wants to merge 8 commits into from
Closed

Use rev in Cargo.toml, update deps #68

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16cd9ab
Update Cargo.tol
Oct 18, 2024
19001ed
Update CI
Oct 18, 2024
f8b26b9
Use mutex
JulianGCalderon Oct 18, 2024
21935ec
Update CI runtime
JulianGCalderon Oct 18, 2024
78641a7
Update lock
JulianGCalderon Oct 18, 2024
b9314db
Update CI
Oct 18, 2024
5a8db1e
Merge pull request #69 from lambdaclass/mutex
JulianGCalderon Oct 18, 2024
4bc0e13
charge_fee false
Oct 18, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.80.0
- uses: dtolnay/rust-toolchain@1.81.0
with:
components: clippy, rustfmt
- uses: Swatinem/rust-cache@v2
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.80.0
- uses: dtolnay/rust-toolchain@1.81.0
with:
components: rustfmt
- run: cargo fmt --all -- --check
Expand All @@ -52,7 +52,7 @@ jobs:
id: fc
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
comment-author: "github-actions[bot]"
body-includes: thiscommentistofindthisformatcomment
- name: Create or update comment
continue-on-error: true
Expand Down Expand Up @@ -86,10 +86,10 @@ jobs:
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/
RUSTUP_TOOLCHAIN: nightly # udeps needs nightly
RUSTUP_TOOLCHAIN: nightly # udeps needs nightly
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.80.0
- uses: dtolnay/rust-toolchain@1.81.0
with:
toolchain: nightly
components: rustfmt
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
sudo rm -rf /usr/local/lib/android
df -h
- name: Setup rust env
uses: dtolnay/rust-toolchain@1.80.0
uses: dtolnay/rust-toolchain@1.81.0
- name: Retreive cached dependecies
uses: Swatinem/rust-cache@v2
- name: Add LLVM Debian repository
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup rust env
uses: dtolnay/rust-toolchain@1.80.0
uses: dtolnay/rust-toolchain@1.81.0
- name: Rust `$PATH` workaround.
run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- uses: Homebrew/actions/setup-homebrew@master
Expand All @@ -192,7 +192,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: lambdaclass/cairo_native
ref: 44d420814553c37cec7d2177892b36fc199f6cda
ref: 4ba9e1609163c0d760f2a716244729d3116cc5ee
path: cairo_native
- name: Build Cairo Native Runtime Library
run: |
Expand Down
16 changes: 7 additions & 9 deletions Cargo.lock
View file
Open in desktop

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

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ resolver = "2"
[workspace.dependencies]
thiserror = "1.0.32"
starknet-types-core = "0.1.6"
starknet_api = { git = "https://github.com/lambdaclass/sequencer", branch = "native2.8.x"}
blockifier = { git = "https://github.com/lambdaclass/sequencer", branch = "native2.8.x"}
cairo-native = { git = "https://github.com/lambdaclass/cairo_native" }
# branch = native2.8.x
starknet_api = { git = "https://github.com/lambdaclass/sequencer", rev = "5ce75fc617bbc709a5997228930030dce358ee79" }
blockifier = { git = "https://github.com/lambdaclass/sequencer", rev = "5ce75fc617bbc709a5997228930030dce358ee79" }
cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "4ba9e1609163c0d760f2a716244729d3116cc5ee" }
tracing = "0.1"
serde_json = "1.0.116"
serde_with = "3.9.0"
serde = "1.0.197"

[patch.'https://github.com/lambdaclass/cairo_native']
cairo-native = { git = 'https://github.com/lambdaclass//cairo_native.git', rev = "82c25b377f50904e1253b614c8719388277530e6" }
cairo-native = { git = 'https://github.com/lambdaclass//cairo_native.git', rev = "4ba9e1609163c0d760f2a716244729d3116cc5ee" }
Loading