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
34 changes: 9 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ name: CI/CD Pipeline

on:
push:
branches: [ main, master ]
branches: [main, master]
pull_request:
branches: [ main, master ]
branches: [main, master]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
PYTHON_VERSION: '3.9'
PYTHON_VERSION: "3.9"
CI: true

jobs:
Expand Down Expand Up @@ -52,9 +52,9 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11']
python-version: ["3.9", "3.10", "3.11"]
exclude:
- python-version: '3.12.0'
- python-version: "3.12.0"

steps:
- name: Checkout code
Expand All @@ -68,7 +68,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}


- name: Set up development environment
env:
CI_SKIP_INSTALL: true
Expand Down Expand Up @@ -108,15 +107,6 @@ jobs:
cp coverage-unit.xml coverage.xml
fi

- name: Upload coverage to Codecov
if: matrix.python-version == '3.9'
uses: codecov/codecov-action@v4
with:
file: ./coverage.xml
flags: unittests
name: codecov-umbrella
fail_ci_if_error: false

integration-tests:
name: Integration Tests
needs: unit-tests
Expand All @@ -126,9 +116,9 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11']
python-version: ["3.9", "3.10", "3.11"]
exclude:
- python-version: '3.12.0'
- python-version: "3.12.0"

steps:
- name: Checkout code
Expand All @@ -144,19 +134,13 @@ jobs:

- name: Install system dependencies
run: |
# Install go-ethereum for evm tool
sudo add-apt-repository -y ppa:ethereum/ethereum
sudo apt-get update
sudo apt-get install -y ethereum

# Install solc-select and Solidity compiler
pip install solc-select
solc-select install 0.8.19
solc-select use 0.8.19

# Verify installations
echo "🔍 Verifying installations:"
which evm && evm --version || echo "⚠️ evm not found"
# Verify
echo "🔍 Verifying..."
which solc && solc --version || echo "⚠️ solc not found"

- name: Set up development environment
Expand Down
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ else
endif

.DEFAULT_GOAL := help
.PHONY: help format lint type-check test test-unit test-integration test-performance test-property test-cov test-unit-cov test-integration-cov all clean install install-dev setup libs-bump-latest libs-bump-dev libs-bump-all
.PHONY: help format lint type-check test test-unit test-integration test-cov test-unit-cov test-integration-cov all clean install install-dev setup libs-bump-latest libs-bump-dev libs-bump-all

help: ## Show this help message
@echo "Available targets:"
Expand Down Expand Up @@ -66,15 +66,6 @@ test-integration: ## Run only integration tests
@echo "🧪 Running integration tests..."
@$(POETRY_RUN) pytest tests/integration/ -v -m integration && echo "✅ Integration tests complete" || (echo "❌ Integration tests failed" && exit 1)

test-performance: ## Run only performance tests
@echo "🧪 Running performance tests..."
@$(POETRY_RUN) pytest tests/performance/ -v && echo "✅ Performance tests complete" || (echo "❌ Performance tests failed" && exit 1)

test-property: ## Run only property-based tests
@echo "🧪 Running property-based tests..."
@$(POETRY_RUN) pytest tests/property/ -v && echo "✅ Property tests complete" || (echo "❌ Property tests failed" && exit 1)


test-cov: ## Run tests with coverage (specify file with: make test-cov TEST=path/to/test_file.py)
ifdef TEST
@echo "🧪 Running test coverage for: $(TEST)..."
Expand Down
Loading