Skip to content

Commit

Permalink
Merge pull request starkware-libs#3493 from starkware-libs/dori/merge…
Browse files Browse the repository at this point in the history
…-main-v0.13.4-into-main-1737361958

Merge main-v0.13.4 into main
  • Loading branch information
dorimedini-starkware authored Jan 20, 2025
2 parents cc87929 + d233fa5 commit cd8a263
Show file tree
Hide file tree
Showing 33 changed files with 1,182 additions and 526 deletions.
2 changes: 2 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[submodule "crates/blockifier/cairo_native"]
ignore = all
12 changes: 8 additions & 4 deletions .github/workflows/blockifier_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,18 @@ on:
- 'scripts/dependencies.sh'
- 'scripts/install_build_tools.sh'
- 'scripts/sequencer-ci.Dockerfile'
- -'crates/starknet_sierra_compile/build.rs'

env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand All @@ -57,7 +62,6 @@ jobs:
# transaction_serde is not activated by any workspace crate; test the build.
- run: cargo build -p blockifier --features transaction_serde
- run: cargo test -p blockifier --features transaction_serde
# TODO(Noa: re-enable this test once the cairo_native feature is fixed.
# cairo_native is not activated by any workspace crate; test the build.
# - run: cargo build -p blockifier --features cairo_native
# - run: cargo test -p blockifier --features cairo_native
- run: cargo build -p blockifier --features cairo_native
- run: cargo test -p blockifier --features cairo_native
6 changes: 5 additions & 1 deletion .github/workflows/blockifier_compiled_cairo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/blockifier_reexecution_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/committer_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/committer_cli_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ env:
EXTRA_RUST_TOOLCHAINS: nightly-2024-04-29

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/main_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/merge_paths_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ on:
- 'scripts/merge_status.py'

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/papyrus_docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- main
- main-v[0-9].**
tags:
- v[0-9].**
- (papyrus-)?v[0-9].**
paths:
- '.github/workflows/papyrus_docker-publish.yml'
- 'crates/papyrus**/**'
Expand All @@ -24,8 +24,12 @@ on:
- 'deployments/images/papyrus/Dockerfile'

# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/sequencer_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ on:
env:
RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"

# On PR events, cancel existing CI runs on this same PR for this workflow.
# On PR events, cancel existing CI runs on this same PR for this workflow.
# Also, create different concurrency groups for different pushed commits, on push events.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
group: >
${{ github.workflow }}-
${{ github.ref }}-
${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
Expand Down
Loading

0 comments on commit cd8a263

Please sign in to comment.