Skip to content

Commit

Permalink
Merge pull request #555 from crytic/dev
Browse files Browse the repository at this point in the history
sync master <> dev
  • Loading branch information
0xalpharush authored Mar 22, 2024
2 parents 62c55fe + 9e23fdc commit b5c538a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
32 changes: 17 additions & 15 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: 3.8

# Used by ci_test.sh
- name: Install dependencies
run: |
python setup.py install
pip install pytest
pip install solc-select
- name: Run Tests
run: |
pytest tests/test_metadata.py
- uses: actions/checkout@v4
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: 3.8
cache: "pip"
cache-dependency-path: setup.py


- name: Install dependencies
run: |
pip install ".[test]"
solc-select use latest --always-install
- name: Run Tests
run: |
pytest tests
7 changes: 4 additions & 3 deletions crytic_compile/utils/naming.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,11 @@ def convert_filename(
short = relative

short = relative_to_short(short)

# Starting with v0.8.8 (https://github.com/ethereum/solidity/pull/11545), solc normalizes the paths to not include the drive on Windows,
# so it's important we use posix path here to avoid issues with the path comparison.
return Filename(
absolute=str(absolute),
absolute=absolute.as_posix(),
relative=relative.as_posix(),
short=short.as_posix(),
used=str(used_filename),
used=Path(used_filename).as_posix(),
)
Binary file added tests/call_to_variable-all.sol-0.5.8-legacy.zip
Binary file not shown.

0 comments on commit b5c538a

Please sign in to comment.