Skip to content

Commit 23f5694

Browse files
author
bohendo
committed
Merge branch 'dev' into creyzies_fix
2 parents e1966fa + 441cabd commit 23f5694

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1561
-985
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

.github/workflows/black.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

22-
- name: Set up Python 3.6
23-
uses: actions/setup-python@v2
22+
- name: Set up Python 3.8
23+
uses: actions/setup-python@v4
2424
with:
25-
python-version: 3.6
25+
python-version: 3.8
2626

2727
- name: Install dependencies
2828
run: |

.github/workflows/ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
tests:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
18+
fail-fast: false
1819
matrix:
1920
os: ["ubuntu-latest", "windows-2022"]
20-
type: ["brownie", "buidler", "dapp", "embark", "etherlime", "hardhat", "solc", "truffle", "waffle", "foundry"]
21+
type: ["brownie", "buidler", "dapp", "embark", "etherlime", "hardhat", "solc", "truffle", "waffle", "foundry", "standard"]
2122
exclude:
2223
# Currently broken, tries to pull git:// which is blocked by GH
2324
- type: embark
@@ -38,36 +39,37 @@ jobs:
3839
id: node
3940
shell: bash
4041
run: |
41-
if [ ${{ matrix.type }} = etherlime ]; then
42-
echo '::set-output name=version::10.17.0'
42+
if [ "${{ matrix.type }}" = "etherlime" ]; then
43+
echo 'version=10.17.0' >> "$GITHUB_OUTPUT"
4344
else
44-
echo '::set-output name=version::lts/*'
45+
echo 'version=lts/*' >> "$GITHUB_OUTPUT"
4546
fi
4647
- name: Set up Node
47-
uses: actions/setup-node@v2
48+
uses: actions/setup-node@v3
4849
with:
4950
node-version: ${{ steps.node.outputs.version }}
50-
- name: Set up Python 3.6
51-
uses: actions/setup-python@v3
51+
- name: Set up Python 3.8
52+
uses: actions/setup-python@v4
5253
with:
53-
python-version: 3.6
54+
python-version: 3.8
5455
- name: Install dependencies
5556
run: |
5657
pip install "solc-select>=v1.0.0b1"
5758
solc-select use 0.5.7 --always-install
5859
pip install .
5960
- name: Set up nix
6061
if: matrix.type == 'dapp'
61-
uses: cachix/install-nix-action@v16
62+
uses: cachix/install-nix-action@v18
6263
- name: Set up cachix
6364
if: matrix.type == 'dapp'
64-
uses: cachix/cachix-action@v10
65+
uses: cachix/cachix-action@v12
6566
with:
6667
name: dapp
6768
- name: Run Tests
6869
env:
6970
TEST_TYPE: ${{ matrix.type }}
7071
GITHUB_ETHERSCAN: ${{ secrets.GITHUB_ETHERSCAN }}
72+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7173
shell: bash
7274
run: |
7375
bash "scripts/ci_test_${TEST_TYPE}.sh"

.github/workflows/darglint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
tests:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v1
17-
- name: Set up Python 3.6
18-
uses: actions/setup-python@v1
16+
- uses: actions/checkout@v3
17+
- name: Set up Python 3.8
18+
uses: actions/setup-python@v4
1919
with:
20-
python-version: 3.6
20+
python-version: 3.8
2121
- name: Run Tests
2222
run: |
2323
bash scripts/ci_darglint.sh

.github/workflows/etherscan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
run: |
2727
echo 'C:\msys64\mingw64\bin' >> "$GITHUB_PATH"
2828
echo 'C:\msys64\usr\bin' >> "$GITHUB_PATH"
29-
- name: Set up Python 3.6
30-
uses: actions/setup-python@v3
29+
- name: Set up Python 3.8
30+
uses: actions/setup-python@v4
3131
with:
32-
python-version: 3.6
32+
python-version: 3.8
3333
- name: Install dependencies
3434
run: |
3535
pip install "solc-select>=v1.0.0b1"

.github/workflows/linter.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

22-
- name: Set up Python 3.6
23-
uses: actions/setup-python@v2
22+
- name: Set up Python 3.8
23+
uses: actions/setup-python@v4
2424
with:
25-
python-version: 3.6
25+
python-version: 3.8
2626

2727
- name: Install dependencies
2828
run: |

.github/workflows/mypy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

22-
- name: Set up Python 3.6
23-
uses: actions/setup-python@v2
22+
- name: Set up Python 3.8
23+
uses: actions/setup-python@v4
2424
with:
25-
python-version: 3.6
25+
python-version: 3.8
2626

2727
- name: Install dependencies
2828
run: |

.github/workflows/pylint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

22-
- name: Set up Python 3.6
23-
uses: actions/setup-python@v2
22+
- name: Set up Python 3.8
23+
uses: actions/setup-python@v4
2424
with:
25-
python-version: 3.6
25+
python-version: 3.8
2626

2727
- name: Install dependencies
2828
run: |

.github/workflows/pytest.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
name: Pytest
3+
4+
defaults:
5+
run:
6+
# To load bashrc
7+
shell: bash -ieo pipefail {0}
8+
9+
on:
10+
push:
11+
branches:
12+
- main
13+
- dev
14+
pull_request:
15+
branches: [main, dev]
16+
schedule:
17+
# run CI every day even if no PRs/merges occur
18+
- cron: '0 12 * * *'
19+
20+
jobs:
21+
tests:
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- uses: actions/checkout@v3
26+
- name: Set up Python 3.8
27+
uses: actions/setup-python@v4
28+
with:
29+
python-version: 3.8
30+
31+
# Used by ci_test.sh
32+
- name: Install dependencies
33+
run: |
34+
python setup.py install
35+
pip install pytest
36+
pip install solc-select
37+
- name: Run Tests
38+
run: |
39+
pytest tests/test_metadata.py

.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
*.nix
2+
*.pyc
13
.idea/
2-
crytic_compile.egg-info/
34
__pycache__/
4-
*.pyc
5+
artifacts
56
build/
6-
dist/
7+
cache
8+
crytic_compile.egg-info/
9+
dist/
10+
node_modules
11+
package-lock.json
12+
result

0 commit comments

Comments
 (0)