Skip to content

Commit

Permalink
chore: small optimizations for the papyrus CI
Browse files Browse the repository at this point in the history
  • Loading branch information
alon-dotan-starkware committed Jul 17, 2024
1 parent 6b545af commit 4a96190
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 58 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ jobs:
run: |
python3 -m venv ci
ci/bin/pip install -r scripts/requirements.txt
ci/bin/python scripts/run_tests.py --changes_only --commit_id ${{ github.base_ref }}
ci/bin/python scripts/run_tests.py --changes_only --features concurrency --commit_id ${{ github.base_ref }}
ci/bin/python scripts/run_tests.py --changes_only --commit_id ${{ github.event.workflow_run.head_sha }}
ci/bin/python scripts/run_tests.py --changes_only --features concurrency --commit_id ${{ github.event.workflow_run.head_sha }}
env:
SEED: 0

# Keep the name 'udeps' to match original action name, so we don't need to define specific branch
# rules on Github for specific version branches.
Expand Down Expand Up @@ -132,3 +134,16 @@ jobs:
cargo-udeps-*/cargo-udeps udeps
env:
RUSTUP_TOOLCHAIN: nightly-2024-01-12

check:
runs-on: ubuntu-latest
env:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: cargo check --workspace -r --all-features
61 changes: 6 additions & 55 deletions .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ env:
PROTOC_VERSION: v25.1

jobs:


executable-run:
runs-on: ubuntu-latest
steps:
Expand All @@ -34,10 +32,10 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: mkdir data

- name: Build node
run: cargo build -r
run: |
mkdir data
cargo build -r
- name: Run executable
run: >
Expand All @@ -53,32 +51,16 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: mkdir data

- name: Build node
run: cargo build -r --no-default-features
run: |
mkdir data
cargo build -r --no-default-features
- name: Run executable
run: >
target/release/papyrus_node --base_layer.node_url ${{ secrets.CI_BASE_LAYER_NODE_URL }}
& sleep 30 ; kill $!
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}
- run: npm install -g [email protected]

- run: |
cargo test --workspace -r
env:
SEED: 0
integration-test:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -109,22 +91,6 @@ jobs:
env:
SEED: 0
rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
components: rustfmt
toolchain: nightly-2024-01-12
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo +nightly-2024-01-12 fmt --all -- --check

doc:
runs-on: ubuntu-latest
env:
Expand All @@ -136,23 +102,8 @@ jobs:
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo doc --workspace -r --document-private-items --no-deps

check:
runs-on: ubuntu-latest
env:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
version: ${{env.PROTOC_VERSION}}

- run: cargo check --workspace -r --all-features

codecov:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def get_local_changes(repo_path, commit_id: Optional[str]) -> List[str]:
print(f"unable to validate {repo_path} as a git repo.")
raise

return [c.a_path for c in repo.head.commit.diff(None)]
return [c.a_path for c in repo.head.commit.diff(commit_id)]


def get_modified_packages(files: List[str]) -> Set[str]:
Expand Down

0 comments on commit 4a96190

Please sign in to comment.