Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/blockifier_compiled_cairo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ jobs:
id: setup-pypy
with:
python-version: 'pypy3.9'
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

- name: Verify cairo contract recompilation (both cairo versions).
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/blockifier_post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
id: setup-pypy
with:
python-version: 'pypy3.9'
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
Expand Down
35 changes: 16 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,19 @@ jobs:
id: setup-pypy
with:
python-version: "pypy3.9"
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

# Install rust components.
- uses: ./.github/actions/bootstrap
with:
extra_rust_toolchains: ${{ env.EXTRA_RUST_TOOLCHAINS }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Python venv
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt

# Check Cargo.lock is up to date.
- name: "Check Cargo.lock"
run: |
Expand All @@ -77,13 +74,13 @@ jobs:
# Run code style on PR.
- name: "Run TODO style pull request"
if: github.event_name == 'pull_request'
run: ci/bin/python scripts/named_todos.py --commit_id ${{ github.event.pull_request.base.sha }}
run: scripts/named_todos.py --commit_id ${{ github.event.pull_request.base.sha }}
- name: "Run clippy pull request"
if: github.event_name == 'pull_request'
run: ci/bin/python scripts/run_tests.py --command clippy --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
run: scripts/run_tests.py --command clippy --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
- name: "Run cargo doc pull request"
if: github.event_name == 'pull_request'
run: ci/bin/python scripts/run_tests.py --command doc --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
run: scripts/run_tests.py --command doc --changes_only --commit_id ${{ github.event.pull_request.base.sha }}

# Run code style on push.
- name: "Run rustfmt"
Expand All @@ -93,10 +90,10 @@ jobs:

- name: "Run clippy on push"
if: github.event_name == 'push'
run: ci/bin/python scripts/run_tests.py --command clippy
run: scripts/run_tests.py --command clippy
- name: "Run cargo doc on push"
if: github.event_name == 'push'
run: ci/bin/python scripts/run_tests.py --command doc
run: scripts/run_tests.py --command doc

- name: "Run taplo"
run: scripts/taplo.sh
Expand Down Expand Up @@ -128,30 +125,29 @@ jobs:
id: setup-pypy
with:
python-version: "pypy3.9"
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

# TODO(Gilad): only one test needs this (base_layer_test.rs), once it migrates to
# anvil, remove.
- run: npm install -g ganache@7.4.3

- name: "Run tests pull request"
if: github.event_name == 'pull_request'
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --command test --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
scripts/run_tests.py --command test --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
env:
SEED: 0

- name: "Run tests on push"
if: github.event_name == 'push'
# TODO(AdiY/Dori): Better support for running tests on push.
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --command test
scripts/run_tests.py --command test
env:
SEED: 0

Expand All @@ -171,19 +167,20 @@ jobs:
id: setup-pypy
with:
python-version: "pypy3.9"
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

# TODO(Gilad): only one test needs this (base_layer_test.rs), once it migrates to
# anvil, remove.
- run: npm install -g ganache@7.4.3

- name: "Run integration tests pull request"
if: github.event_name == 'pull_request'
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --command integration --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
scripts/run_tests.py --command integration --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
env:
SEED: 0
14 changes: 5 additions & 9 deletions .github/workflows/main_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,21 @@ jobs:
id: setup-pypy
with:
python-version: "pypy3.9"
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

# Install rust components.
- uses: ./.github/actions/bootstrap
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Python venv
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt

# Run feature combo test.
- name: "Run feature combo on all crates."
run: ci/bin/python scripts/run_feature_combos_test.py
run: scripts/run_feature_combos_test.py

run-integration-tests:
runs-on: starkware-ubuntu-24.04-large
Expand All @@ -77,14 +74,13 @@ jobs:
- env:
LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt
# TODO(Gilad): only one test needs this (base_layer_test.rs), once it migrates to
# anvil, remove.
- run: npm install -g ganache@7.4.3

- name: "Run integration tests pull request"
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --command integration --is_nightly
scripts/run_tests.py --command integration --is_nightly
env:
SEED: 0
1 change: 1 addition & 0 deletions .github/workflows/merge_paths_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: '3.9'
cache: 'pip'
- run: |
python -m pip install --upgrade pip
pip install pytest
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/merge_queue_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,27 @@ jobs:
id: setup-pypy
with:
python-version: "pypy3.9"
cache: 'pip'
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
- env:
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- run: pip install -r scripts/requirements.txt

# Install rust components.
- uses: ./.github/actions/bootstrap
with:
extra_rust_toolchains: ${{ env.EXTRA_RUST_TOOLCHAINS }}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Python venv
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt

# Check Cargo.lock is up to date.
- name: "Check Cargo.lock"
run: |
cargo update -w --locked
git diff --exit-code Cargo.lock

- name: "Run clippy on merge queue"
run: ci/bin/python scripts/run_tests.py --command clippy
run: scripts/run_tests.py --command clippy

- name: "Run rustfmt on merge queue"
# The nightly here is coupled with the one in install_rust/action.yml.
Expand Down
2 changes: 2 additions & 0 deletions scripts/named_todos.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/env python3

import os
import re

Expand Down