diff --git a/.github/workflows/capsule-cypress.yml b/.github/workflows/capsule-cypress.yml index a1332d7c5..55f665da4 100644 --- a/.github/workflows/capsule-cypress.yml +++ b/.github/workflows/capsule-cypress.yml @@ -33,14 +33,6 @@ jobs: ## Checkout capsule ####### - # Checkout front ends - - name: Checkout frontend mono repo - uses: actions/checkout@v2 - with: - ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 0 - path: './frontend-monorepo' - # Checkout capsule to build local network - name: Checkout capsule uses: actions/checkout@v2 @@ -88,7 +80,7 @@ jobs: run: vegacapsule nomad & - name: Bootstrap network - run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force + run: vegacapsule network bootstrap --config-path=./net_confs/config.hcl --force working-directory: capsule ###### @@ -112,19 +104,23 @@ jobs: ## Run some tests ###### + # Checkout front ends + - name: Checkout frontend mono repo + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands uses: nrwl/nx-set-shas@v2 with: - working-directory: frontend-monorepo main-branch-name: master - name: Install root dependencies run: yarn install - working-directory: frontend-monorepo - name: Run Cypress tests run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome - working-directory: frontend-monorepo env: CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }} CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }} diff --git a/vegacapsule/config.hcl b/vegacapsule/config.hcl deleted file mode 100644 index df909d10b..000000000 --- a/vegacapsule/config.hcl +++ /dev/null @@ -1,554 +0,0 @@ -vega_binary_path = "vega" - -network "testnet" { - ethereum { - chain_id = "1440" - network_id = "1441" - endpoint = "http://127.0.0.1:8545/" - } - - faucet "faucet-1" { - wallet_pass = "f4uc3tw4ll3t-v3g4-p4ssphr4e3" - - template = <<-EOT -[Node] - Port = 3002 - IP = "127.0.0.1" -EOT - } - - wallet "wallet-1" { - binary = "vegawallet" - - template = <<-EOT -Name = "DV" -Level = "info" -TokenExpiry = "168h0m0s" -Port = 1789 -Host = "0.0.0.0" - -[API] - [API.GRPC] - Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}] - Retries = 5 -EOT - } - - pre_start { - docker_service "ganache-1" { - image = "vegaprotocol/ganache:v1.2.4" - cmd = "ganache-cli" - args = [ - "--blockTime", "1", - "--chainId", "1440", - "--networkId", "1441", - "-h", "0.0.0.0", - "-p", "8545", - "-m", "ozone access unlock valid olympic save include omit supply green clown session", - "--db", "/app/ganache-db", - "--account_keys_path", "keys.json" - ] - static_port { - value = 8545 - } - auth_soft_fail = true - } - } - - genesis_template = <