Skip to content

Commit b5c538a

Browse files
authored
Merge pull request #555 from crytic/dev
sync master <> dev
2 parents 62c55fe + 9e23fdc commit b5c538a

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

.github/workflows/pytest.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v4
30-
- name: Set up Python 3.8
31-
uses: actions/setup-python@v5
32-
with:
33-
python-version: 3.8
34-
35-
# Used by ci_test.sh
36-
- name: Install dependencies
37-
run: |
38-
python setup.py install
39-
pip install pytest
40-
pip install solc-select
41-
- name: Run Tests
42-
run: |
43-
pytest tests/test_metadata.py
29+
- uses: actions/checkout@v4
30+
- name: Set up Python 3.8
31+
uses: actions/setup-python@v5
32+
with:
33+
python-version: 3.8
34+
cache: "pip"
35+
cache-dependency-path: setup.py
36+
37+
38+
- name: Install dependencies
39+
run: |
40+
pip install ".[test]"
41+
solc-select use latest --always-install
42+
43+
- name: Run Tests
44+
run: |
45+
pytest tests

crytic_compile/utils/naming.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,11 @@ def convert_filename(
188188
short = relative
189189

190190
short = relative_to_short(short)
191-
191+
# Starting with v0.8.8 (https://github.com/ethereum/solidity/pull/11545), solc normalizes the paths to not include the drive on Windows,
192+
# so it's important we use posix path here to avoid issues with the path comparison.
192193
return Filename(
193-
absolute=str(absolute),
194+
absolute=absolute.as_posix(),
194195
relative=relative.as_posix(),
195196
short=short.as_posix(),
196-
used=str(used_filename),
197+
used=Path(used_filename).as_posix(),
197198
)
1.87 KB
Binary file not shown.

0 commit comments

Comments
 (0)