Merge pull request #1185 from eth-brownie/ci/multiple-jobs

Split CI into multiple workflows

.github/workflows/main.yaml → .github/workflows/core-ganache.yaml

@@ -1,6 +1,6 @@
 on: ["push", "pull_request"]
 
-name: brownie workflow
+name: core (ganache)
 
 env:
   ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
@@ -9,118 +9,6 @@ env:
 
 jobs:
 
-  linting:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        job: [lint, docs-local]
-        experimental: [false]
-        include:
-          - job: docs-external
-            experimental: true
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup Python 3.6
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install Tox
-      run: pip install tox
-
-    - name: Run Tox
-      run: tox -e ${{ matrix.job }}
-      continue-on-error: ${{ matrix.experimental }}
-
-
-  functionality:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        job: [plugintest, pmtest]
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Cache Solidity Installations
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.solcx
-          ~/.vvm
-        key: ${{ runner.os }}-compiler-cache
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v1
-
-    - name: Install Ganache
-      run: npm install -g ganache-cli@6.12.2
-
-    - name: Setup Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install Tox
-      run: pip install tox
-
-    - name: Run Tox
-      run: tox -e ${{ matrix.job }}
-
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
-      with:
-        file: ./coverage.xml
-
-
-  evm:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        job: [evm-byzantium, evm-petersburg, evm-istanbul, evm-latest]
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Cache Solidity Installations
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.solcx
-          ~/.vvm
-        key: ${{ runner.os }}-compiler-cache
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v1
-
-    - name: Install Ganache
-      run: npm install -g ganache-cli@6.12.2
-
-    - name: Setup Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-
-    - name: Install Tox
-      run: pip install tox
-
-    - name: Run Tox
-      run: tox -e ${{ matrix.job }}
-
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
-      with:
-        file: ./coverage.xml
-
-
   py38core:
     runs-on: ${{ matrix.os }}
 

.github/workflows/evm.yaml

@@ -0,0 +1,51 @@
+on: ["push", "pull_request"]
+
+name: evm tests
+
+env:
+  ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  WEB3_INFURA_PROJECT_ID: 44c6300c5e5b4b2da5fc42b06bf18a8e
+
+jobs:
+
+  evm:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job: [evm-byzantium, evm-petersburg, evm-istanbul, evm-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Cache Solidity Installations
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.solcx
+          ~/.vvm
+        key: ${{ runner.os }}-compiler-cache
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v1
+
+    - name: Install Ganache
+      run: npm install -g ganache-cli@6.12.2
+
+    - name: Setup Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install Tox
+      run: pip install tox
+
+    - name: Run Tox
+      run: tox -e ${{ matrix.job }}
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.xml

.github/workflows/functionality.yaml

@@ -0,0 +1,51 @@
+on: ["push", "pull_request"]
+
+name: functionality
+
+env:
+  ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  WEB3_INFURA_PROJECT_ID: 44c6300c5e5b4b2da5fc42b06bf18a8e
+
+jobs:
+
+  functionality:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job: [plugintest, pmtest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Cache Solidity Installations
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.solcx
+          ~/.vvm
+        key: ${{ runner.os }}-compiler-cache
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v1
+
+    - name: Install Ganache
+      run: npm install -g ganache-cli@6.12.2
+
+    - name: Setup Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install Tox
+      run: pip install tox
+
+    - name: Run Tox
+      run: tox -e pmtest
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.xml

.github/workflows/lint.yaml

@@ -0,0 +1,37 @@
+on: ["push", "pull_request"]
+
+name: linting
+
+env:
+  ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  WEB3_INFURA_PROJECT_ID: 44c6300c5e5b4b2da5fc42b06bf18a8e
+
+jobs:
+
+  linting:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        job: [lint, docs-local]
+        experimental: [false]
+        include:
+          - job: docs-external
+            experimental: true
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Python 3.6
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install Tox
+      run: pip install tox
+
+    - name: Run Tox
+      run: tox -e ${{ matrix.job }}
+      continue-on-error: ${{ matrix.experimental }}

tests/conftest.py

@@ -28,6 +28,7 @@
     "pm": "package_test",
     "plugin": "plugintester",
 }
+_dev_network = "development"
 
 
 def pytest_addoption(parser):
@@ -43,10 +44,19 @@ def pytest_addoption(parser):
         metavar=("solc_versions", "evm_rulesets", "optimizer_runs"),
         help="Run evm tests against a matrix of solc versions, evm versions, and compiler runs.",
     )
+    parser.addoption(
+        "--network",
+        choices=["development", "hardhat"],
+        default="development",
+    )
 
 
 # remove tests based on config flags and fixture names
 def pytest_collection_modifyitems(config, items):
+    if config.getoption("--network"):
+        global _dev_network
+        _dev_network = config.getoption("--network")
+
     if config.getoption("--evm"):
         target = "evm"
     else:
@@ -107,6 +117,11 @@ def pytest_sessionstart(session):
         )
 
 
+@pytest.fixture(scope="session")
+def network_name():
+    return _dev_network
+
+
 # worker ID for xdist process, as an integer
 @pytest.fixture(scope="session")
 def xdist_id(worker_id):
@@ -117,7 +132,7 @@ def xdist_id(worker_id):
 
 # ensure a clean data folder, and set unique ganache ports for each xdist worker
 @pytest.fixture(scope="session", autouse=True)
-def _base_config(tmp_path_factory, xdist_id):
+def _base_config(tmp_path_factory, xdist_id, network_name):
     brownie._config.DATA_FOLDER = tmp_path_factory.mktemp(f"data-{xdist_id}")
     brownie._config._make_data_folders(brownie._config.DATA_FOLDER)
 
@@ -128,7 +143,7 @@ def _base_config(tmp_path_factory, xdist_id):
 
     if xdist_id:
         port = 8545 + xdist_id
-        brownie._config.CONFIG.networks["development"]["cmd_settings"]["port"] = port
+        brownie._config.CONFIG.networks[network_name]["cmd_settings"]["port"] = port
 
 
 @pytest.fixture(scope="session")
@@ -220,9 +235,9 @@ def evmtester(_project_factory, project, tmp_path, accounts, request):
 
 
 @pytest.fixture
-def plugintesterbase(project, testdir, monkeypatch):
+def plugintesterbase(project, testdir, monkeypatch, network_name):
     brownie.test.coverage.clear()
-    brownie.network.connect()
+    brownie.network.connect(network_name)
     monkeypatch.setattr("brownie.network.connect", lambda k: None)
     testdir.plugins.extend(["pytest-brownie", "pytest-cov"])
     yield testdir
@@ -244,8 +259,8 @@ def plugintester(_project_factory, plugintesterbase, request):
 
 # launches and connects to ganache, yields the brownie.network module
 @pytest.fixture
-def devnetwork(network, rpc, chain):
-    brownie.network.connect("development")
+def devnetwork(network, rpc, chain, network_name):
+    brownie.network.connect(network_name)
     yield brownie.network
     if rpc.is_active():
         chain.reset()

tests/network/account/test_accounts.py

@@ -10,7 +10,7 @@
 addr = "0x14b0Ed2a7C4cC60DD8F676AE44D0831d3c9b2a9E"
 
 
-def test_repopulate(accounts, network, chain, rpc):
+def test_repopulate(accounts, network, chain, rpc, network_name):
     assert len(accounts) > 0
     a = list(accounts)
     chain.reset()
@@ -20,7 +20,7 @@ def test_repopulate(accounts, network, chain, rpc):
     network.disconnect()
     assert len(accounts) == 0
     assert not rpc.is_active()
-    network.connect("development")
+    network.connect(network_name)
     assert len(accounts) == len(a)
 
 

tests/network/rpc/conftest.py

@@ -17,8 +17,8 @@ def original_port(xdist_id):
 
 
 @pytest.fixture(scope="module")
-def _no_rpc_setup(rpc, chain, web3, temp_port, original_port):
-    CONFIG.networks["development"]["cmd_settings"]["port"] = temp_port
+def _no_rpc_setup(rpc, chain, web3, temp_port, original_port, network_name):
+    CONFIG.networks[network_name]["cmd_settings"]["port"] = temp_port
     web3.connect(f"http://127.0.0.1:{temp_port}")
     proc = rpc.process
     reset_id = chain._reset_id
@@ -28,7 +28,7 @@ def _no_rpc_setup(rpc, chain, web3, temp_port, original_port):
     # rpc.launch = _launch
     _notify_registry(0)
     yield
-    CONFIG.networks["development"]["cmd_settings"]["port"] = original_port
+    CONFIG.networks[network_name]["cmd_settings"]["port"] = original_port
     web3.connect(f"http://127.0.0.1:{original_port}")
     # rpc.launch = rpc._launch
     rpc.kill(False)