Skip to content

Commit

Permalink
Merge branch 'main' into refactor_aws
Browse files Browse the repository at this point in the history
  • Loading branch information
ocdbytes authored Aug 23, 2024
2 parents 42ec7ce + 11dc132 commit bdfc068
Show file tree
Hide file tree
Showing 28 changed files with 1,785 additions and 344 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ MEMORY_PAGES_CONTRACT_ADDRESS=
PRIVATE_KEY=
ETHEREUM_PRIVATE_KEY=
STARKNET_SOLIDITY_CORE_CONTRACT_ADDRESS=

1 change: 0 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ MEMORY_PAGES_CONTRACT_ADDRESS="0x000000000000000000000000000000000001dead"
PRIVATE_KEY="0xdead"
ETHEREUM_PRIVATE_KEY="0x000000000000000000000000000000000000000000000000000000000000beef"
STARKNET_SOLIDITY_CORE_CONTRACT_ADDRESS="0x000000000000000000000000000000000002dead"

31 changes: 25 additions & 6 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
name: Rust Test & Coverage

on:
workflow_dispatch:
pull_request_target:
branches:
- main
types: [opened, synchronize, reopened]
push:
branches-ignore:
- main
workflow_call:
workflow_dispatch:

jobs:
coverage:
Expand Down Expand Up @@ -40,6 +47,20 @@ jobs:
- name: Rust Cache
uses: Swatinem/rust-cache@v2

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Check Anvil Installation
run: |
if command -v anvil &> /dev/null
then
echo "Anvil is installed. Version information:"
anvil --version
else
echo "Anvil is not installed or not in PATH"
exit 1
fi
- name: Install cargo-llvm-cov & nextest
uses: taiki-e/install-action@cargo-llvm-cov

Expand All @@ -50,11 +71,9 @@ jobs:
run: |
wget -P ./crates/prover-services/sharp-service/tests/artifacts https://madara-orchestrator-sharp-pie.s3.amazonaws.com/238996-SN.zip
- name: Clean workspace
run: |
cargo clean --doc
- name: Run tests llvm-cov
- name: Run llvm-cov tests
env:
ETHEREUM_BLAST_RPC_URL: ${{ secrets.ETHEREUM_BLAST_RPC_URL }}
run: cargo llvm-cov nextest --release --lcov --output-path lcov.info --test-threads=1

- name: Coveralls
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linters-cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: Task - Linters Cargo
on:
workflow_dispatch:
workflow_call:
push:

jobs:
cargo-lint:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: Task - Linters
on:
workflow_dispatch:
workflow_call:
push:

jobs:
prettier:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name: Workflow - Pull Request

on:
workflow_dispatch:
pull_request:
pull_request_target:
branches: [main]
push:
branches: [main]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rust-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: Task - Build Rust
on:
workflow_dispatch:
workflow_call:
push:

jobs:
rust_build:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## Added

- Tests for Settlement client.
- Worker queues to listen for trigger events.
- Tests for prover client.
- Added Rust Cache for Coverage Test CI.
Expand Down
Loading

0 comments on commit bdfc068

Please sign in to comment.