Skip to content

Commit

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

Merge main-v0.13.2 into main
  • Loading branch information
dorimedini-starkware authored Aug 6, 2024
2 parents 1d04155 + 09cd2b3 commit 8a94052
Show file tree
Hide file tree
Showing 45 changed files with 224 additions and 210 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/blockifier_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ on:
- auto_merge_enabled
- edited
paths:
- '.github/workflows/blockifier_ci.yml'
- 'crates/blockifier/**'
- 'crates/native_blockifier/**'
- 'build_native_blockifier_in_docker.sh'
- 'scripts/build_native_blockifier.sh'

jobs:
featureless-build:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -36,7 +37,7 @@ jobs:
- run: cargo test -p blockifier

native-blockifier-artifacts-push:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/blockifier_compiled_cairo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@ name: Blockifier-Compiled-Cairo
on:
push:
branches:
- main
- main
tags:
- v[0-9].**
- v[0-9].**
paths:
- 'crates/blockifier/feature_contracts/cairo0/**'
- 'crates/blockifier/feature_contracts/cairo0/**'
- '.github/workflows/blockifier_compiled_cairo.yml'
pull_request:
types:
- opened
- reopened
- synchronize
paths:
- 'crates/blockifier/feature_contracts/cairo0/**'
- '.github/workflows/blockifier_compiled_cairo.yml'
- 'crates/blockifier/feature_contracts/cairo0/**'

jobs:
verify_cairo_file_dependencies:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Noelware/[email protected]
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/blockifier_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ name: Blockifier-Coverage
on:
pull_request:
paths:
- '.github/workflows/blockifier_coverage.yml'
- 'crates/blockifier/**'
push:
paths:
- '.github/workflows/blockifier_coverage.yml'
- 'crates/blockifier/**'

jobs:
coverage:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
env:
CARGO_TERM_COLOR: always
steps:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/blockifier_post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@ on:
types:
- closed
paths:
- '.github/workflows/blockifier_post-merge.yml'
- 'crates/blockifier/**'
jobs:
if_merged:
if: github.event.pull_request.merged == true
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Noelware/[email protected]
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean_stale_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
stale:
name: 🧹 Clean up stale issues and PRs
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- name: 🚀 Run stale
uses: actions/stale@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/committer_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

jobs:
run-regression-tests:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -46,7 +46,7 @@ jobs:
- run: cargo test -p committer_cli --release -- --include-ignored test_regression

benchmarking:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
# Checkout the base branch to get the old code.
- uses: actions/checkout@v4
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
})
gcs-push:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock_closed_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
lock:
name: 🔒 Lock closed issues and PRs
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: dessant/[email protected]
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
commitlint:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -41,7 +41,7 @@ jobs:
run: echo "$TITLE" | commitlint --verbose

format:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -54,7 +54,7 @@ jobs:
- run: scripts/rust_fmt.sh --check

clippy:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: Noelware/[email protected]
Expand All @@ -78,7 +78,7 @@ jobs:
- run: scripts/clippy.sh

doc:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
env:
RUSTDOCFLAGS: "-D warnings"
steps:
Expand All @@ -91,7 +91,7 @@ jobs:
- run: cargo doc --workspace -r --document-private-items --no-deps

run-tests:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
SEED: 0

taplo:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -147,14 +147,14 @@ jobs:
- run: scripts/taplo.sh

machete:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- name: Run Machete (detect unused dependencies)
uses: bnjbvr/cargo-machete@main

check:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
env:
RUSTDOCFLAGS: "-D warnings"
steps:
Expand All @@ -167,7 +167,7 @@ jobs:
- run: cargo check --workspace -r --all-features

merge-gatekeeper:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
# Restrict permissions of the GITHUB_TOKEN.
# Docs: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_paths_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

jobs:
merge-paths-test:
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/papyrus/helm-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
deploy-teardown:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
permissions:
contents: "read"
id-token: "write"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ env:

jobs:
executable-run:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -57,7 +57,7 @@ jobs:
& sleep 30 ; kill $!
executable-run-no-rpc:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -76,7 +76,7 @@ jobs:
& sleep 30 ; kill $!
integration-test:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -93,7 +93,7 @@ jobs:
cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream"
test-no-rpc:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand All @@ -106,7 +106,7 @@ jobs:
SEED: 0
codecov:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -135,15 +135,15 @@ jobs:
version: "v0.1.15"

check-starknet_api-dependency:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
if: github.base_ref == 'main' # this step is only run if the pr is to the main branch
steps:
- uses: actions/checkout@v4
- run: sudo apt-get install jq
- run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main

build-papyrus-utilities-image:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
Expand All @@ -159,7 +159,7 @@ jobs:
cache-to: type=gha,mode=max,scope=buildkit-ci

random-table-test:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
# run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes.
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/papyrus_docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ on:
branches: [main]
tags: ["v*.*.*"]
paths:
- '.github/workflows/papyrus_docker-publish.yml'
- 'crates/papyrus**/**'

pull_request:
paths:
- '.github/workflows/papyrus_docker-publish.yml'
- 'crates/papyrus**/**'

env:
Expand All @@ -18,7 +20,7 @@ env:

jobs:
docker-build-push:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-medium

steps:
- name: Checkout repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/papyrus_nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
GW-integration-test-ubuntu:
uses: ./.github/workflows/papyrus_nightly-tests-call.yml
with:
os: ubuntu-latest
os: starkware-ubuntu-latest-small
secrets:
INTEGRATION_TESTNET_NODE_URL: ${{ secrets.INTEGRATION_TESTNET_NODE_URL }}
INTEGRATION_TESTNET_SENDER_PRIVATE_KEY: ${{ secrets.INTEGRATION_TESTNET_SENDER_PRIVATE_KEY }}
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
# TODO(dvir): make this run only if the path 'crates/papyrus_storage/src/db/**' (same path as in the CI) was changed on the
# last day and increase the number of repetitions.
random-table-test:
runs-on: ubuntu-latest
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
latest_deps:
name: Latest Dependencies
runs-on: ubuntu-20.04
runs-on: starkware-ubuntu-latest-medium
continue-on-error: true
steps:
- uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit 8a94052

Please sign in to comment.