Skip to content

Commit caf25ac

Browse files
Merge branch 'main' into remove-panics
2 parents e96b296 + 390bd91 commit caf25ac

File tree

20 files changed

+1245
-1423
lines changed

20 files changed

+1245
-1423
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
- name: Install scarb
176176
uses: software-mansion/setup-scarb@v1
177177
with:
178-
scarb-version: "2.9.2"
178+
scarb-version: "2.10.1"
179179
- name: Install deps
180180
run: make deps
181181
- name: Run tests
@@ -243,7 +243,7 @@ jobs:
243243
- name: Install scarb
244244
uses: software-mansion/setup-scarb@v1
245245
with:
246-
scarb-version: "2.9.2"
246+
scarb-version: "2.10.1"
247247
- name: Install deps
248248
run: make deps
249249
- name: Build alexandria

.github/workflows/release.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,25 @@ jobs:
2727
include:
2828
- target: x86_64-unknown-linux-gnu
2929
os: ubuntu-24.04
30-
env:
31-
MLIR_SYS_190_PREFIX: /usr/lib/llvm-19/
32-
LLVM_SYS_191_PREFIX: /usr/lib/llvm-19/
33-
TABLEGEN_190_PREFIX: /usr/lib/llvm-19/
30+
dep_base_dir: /usr/lib/llvm-19
3431
- target: x86_64-apple-darwin
3532
os: macos-14
36-
env:
37-
MLIR_SYS_190_PREFIX: /opt/homebrew/opt/llvm@19
38-
LLVM_SYS_191_PREFIX: /opt/homebrew/opt/llvm@19
39-
TABLEGEN_190_PREFIX: /opt/homebrew/opt/llvm@19
33+
dep_base_dir: /opt/homebrew/opt/llvm@19
4034
runs-on: ${{ matrix.os }}
4135
steps:
4236
- uses: actions/checkout@v4
37+
- name: Set env
38+
run: echo "MLIR_SYS_190_PREFIX=${{ matrix.dep_base_dir }}" >> $GITHUB_ENV && \
39+
echo "LLVM_SYS_191_PREFIX=${{ matrix.dep_base_dir }}" >> $GITHUB_ENV && \
40+
echo "TABLEGEN_190_PREFIX=${{ matrix.dep_base_dir }}" >> $GITHUB_ENV
4341
- name: Install deps
4442
# deps-ci-linux does nothing on macos so it works
4543
run: make deps && make deps-ci-linux
4644
- uses: taiki-e/upload-rust-binary-action@v1
4745
with:
4846
# (required) Comma-separated list of binary names (non-extension portion of filename) to build and upload.
4947
# Note that glob pattern is not supported yet.
50-
bin: cairo-native-compile,cairo-native-dump,cairo-native-run,cairo-native-stress,cairo-native-test
48+
bin: cairo-native-compile,cairo-native-dump,cairo-native-run,cairo-native-stress,cairo-native-test,starknet-native-compile
5149
# (optional) Target triple, default is host triple.
5250
# This is optional but it is recommended that this always be set to
5351
# clarify which target you are building for if macOS is included in

.github/workflows/starknet-blocks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
repository: lambdaclass/starknet-replay
3434
path: starknet-replay
35-
ref: b4b7dbf1bb5313301515882d7e228616f3f70e48
35+
ref: 99f57191880562e83628e2d320bfd4eaf24e6c95
3636
# We need native to use the linux deps ci action
3737
- name: Checkout Native
3838
uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
repository: lambdaclass/sequencer
4545
path: sequencer
46-
ref: 9487df3ada00d03bbd9fc39331c4ec1ac0994954
46+
ref: 12ea9447b8ea1763bd23efa7a573333e4e057f0d
4747

4848
- name: Cache RPC Calls
4949
uses: actions/cache@v4.2.0

0 commit comments

Comments
 (0)