Skip to content

Commit 46ab5fd

Browse files
elopezelopez
authored
Merge pull request #626 from crytic/dev
Sync Master <> Dev
2 parents 3c83210 + 43b23ff commit 46ab5fd

32 files changed

+198
-149
lines changed

‎.github/workflows/black.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout Code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Set up Python 3.8
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: 3.8
3030

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,40 +21,35 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: ["ubuntu-latest", "windows-2022"]
25-
python: ${{ (github.event_name == 'pull_request' && fromJSON('["3.8", "3.12"]')) || fromJSON('["3.8", "3.9", "3.10", "3.11", "3.12"]') }}
24+
os: ["ubuntu-latest", "windows-2025"]
25+
python: ${{ (github.event_name == 'pull_request' && fromJSON('["3.8", "3.13"]')) || fromJSON('["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]') }}
2626
type: ["brownie", "buidler", "dapp", "embark", "hardhat", "solc", "truffle", "waffle", "foundry", "standard", "vyper", "solc_multi_file", "hardhat_multi_file"]
27+
include:
28+
# buidler requires older NodeJS
29+
- type: buidler
30+
node-version: 12
2731
exclude:
2832
# Currently broken, tries to pull git:// which is blocked by GH
2933
- type: embark
3034
# Requires nix
31-
- os: windows-2022
35+
- os: windows-2025
3236
type: dapp
3337
# Explore foundry support in windows
34-
- os: windows-2022
38+
- os: windows-2025
3539
type: foundry
36-
# brownie does not install correctly with Python 3.10
37-
- python: 3.10
38-
type: brownie
39-
# brownie does not install correctly with Python 3.11
40-
- python: 3.11
41-
type: brownie
42-
# brownie does not install correctly with Python 3.12
43-
- python: 3.12
44-
type: brownie
4540
steps:
46-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v5
4742
- name: Set up shell
4843
if: runner.os == 'Windows'
4944
run: |
5045
echo 'C:\msys64\mingw64\bin' >> "$GITHUB_PATH"
5146
echo 'C:\msys64\usr\bin' >> "$GITHUB_PATH"
5247
- name: Set up Node
53-
uses: actions/setup-node@v4
48+
uses: actions/setup-node@v6
5449
with:
55-
node-version: 18.15
50+
node-version: ${{ matrix.node-version || '18.15' }}
5651
- name: Set up Python ${{ matrix.python }}
57-
uses: actions/setup-python@v5
52+
uses: actions/setup-python@v6
5853
with:
5954
python-version: ${{ matrix.python }}
6055
- name: Install dependencies

‎.github/workflows/darglint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
tests:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
- name: Set up Python 3.8
22-
uses: actions/setup-python@v5
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: 3.8
2525
- name: Run Tests

‎.github/workflows/doc.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3232
- name: Setup Pages
3333
uses: actions/configure-pages@v5
34-
- uses: actions/setup-python@v5
34+
- uses: actions/setup-python@v6
3535
with:
3636
python-version: '3.8'
3737
- run: pip install -e ".[doc]"
3838
- run: pdoc -o html/ crytic_compile
3939
- name: Upload artifact
40-
uses: actions/upload-pages-artifact@v3
40+
uses: actions/upload-pages-artifact@v4
4141
with:
4242
# Upload the doc
4343
path: './html/'

‎.github/workflows/etherscan.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121
runs-on: ${{ matrix.os }}
2222
strategy:
2323
matrix:
24-
os: ["ubuntu-latest", "windows-2022"]
24+
os: ["ubuntu-latest", "windows-2025"]
2525
type: ["etherscan"]
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v5
2828
- name: Set up shell
2929
if: runner.os == 'Windows'
3030
run: |
3131
echo 'C:\msys64\mingw64\bin' >> "$GITHUB_PATH"
3232
echo 'C:\msys64\usr\bin' >> "$GITHUB_PATH"
3333
- name: Set up Python 3.8
34-
uses: actions/setup-python@v5
34+
uses: actions/setup-python@v6
3535
with:
3636
python-version: 3.8
3737
- name: Install dependencies

‎.github/workflows/linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout Code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Set up Python 3.8
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: 3.8
3030

‎.github/workflows/mypy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout Code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Set up Python 3.8
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: 3.8
3030

‎.github/workflows/publish.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Set up Python
16-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1717
with:
1818
python-version: '3.x'
1919

@@ -24,7 +24,7 @@ jobs:
2424
python -m build
2525
2626
- name: Upload distributions
27-
uses: actions/upload-artifact@v4
27+
uses: actions/upload-artifact@v5
2828
with:
2929
name: crytic-compile-dists
3030
path: dist/
@@ -39,16 +39,16 @@ jobs:
3939
- build-release
4040
steps:
4141
- name: fetch dists
42-
uses: actions/download-artifact@v4
42+
uses: actions/download-artifact@v6
4343
with:
4444
name: crytic-compile-dists
4545
path: dist/
4646

4747
- name: publish
48-
uses: pypa/gh-action-pypi-publish@v1.12.4
48+
uses: pypa/gh-action-pypi-publish@v1.13.0
4949

5050
- name: sign
51-
uses: sigstore/gh-action-sigstore-python@v3.0.0
51+
uses: sigstore/gh-action-sigstore-python@v3.1.0
5252
with:
5353
inputs: ./dist/*.tar.gz ./dist/*.whl
5454
release-signing-artifacts: true

‎.github/workflows/pylint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout Code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Set up Python 3.8
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: 3.8
3030

‎.github/workflows/pytest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
- name: Set up Python 3.8
31-
uses: actions/setup-python@v5
31+
uses: actions/setup-python@v6
3232
with:
3333
python-version: 3.8
3434
cache: "pip"

0 commit comments

Comments
 (0)