From 1f458d5279531ae9698cb76b7aea81e042a4ce0a Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 12:03:02 -0400 Subject: [PATCH 1/7] enforce go 1.18 for check --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 00f51054ed15..f3f88a1ae129 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: ">=1.18.0" + go-version: "1.18" check-latest: true - uses: actions/checkout@v2 - name: Run linter From a759c979fd71a2f51e2c6ea7dd488c3b843746bf Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 13:37:31 -0400 Subject: [PATCH 2/7] tests on 1.18 as well --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 809b50d6b0f6..379039460147 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: ">=1.18.0" + go-version: "1.18" check-latest: true - name: Checkout code @@ -47,7 +47,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: ">=1.18.0" + go-version: "1.18" check-latest: true - name: Checkout code @@ -72,7 +72,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: ">=1.18.0" + go-version: "1.18" check-latest: true - name: Checkout code From 402893b25b60a2b9a64eaac7762644cde68cada4 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 14:12:52 -0400 Subject: [PATCH 3/7] test update for running containers --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 379039460147..617822b46a7c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -120,6 +120,7 @@ jobs: run: | COUNT=0 ATTEMPTS=15 + docker ps until $(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" cp go-ethereum:/root/transaction_info/STATEFUL_TEST_DEPLOYED_ADDRESS ./STATEFUL_TEST_DEPLOYED_ADDRESS) || [[ $COUNT -eq $ATTEMPTS ]]; do echo -e "$(( COUNT++ ))... \c"; sleep 10; done [[ $COUNT -eq $ATTEMPTS ]] && echo "Could not find the successful contract deployment" && (exit 1) cat ./STATEFUL_TEST_DEPLOYED_ADDRESS From 470491c99cfccea6b88ac6dc76315420a952438a Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 14:42:22 -0400 Subject: [PATCH 4/7] adding db yml for possible change in docker-compose behavior in yml parsing --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 617822b46a7c..4acfab7c2656 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -129,7 +129,7 @@ jobs: - name: Create a new transaction. shell: bash run: | - docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec go-ethereum /bin/bash /root/transaction_info/NEW_TRANSACTION + docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec go-ethereum /bin/bash /root/transaction_info/NEW_TRANSACTION echo $? - name: Make sure we see entries in the header table From 8ca5b7852e6ca70376b2e4aaa3ac356a7692fce8 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 15:06:43 -0400 Subject: [PATCH 5/7] adding db yml for possible change in docker-compose behavior in yml parsing in transaction test --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4acfab7c2656..a2fb3ec3e489 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -121,7 +121,7 @@ jobs: COUNT=0 ATTEMPTS=15 docker ps - until $(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" cp go-ethereum:/root/transaction_info/STATEFUL_TEST_DEPLOYED_ADDRESS ./STATEFUL_TEST_DEPLOYED_ADDRESS) || [[ $COUNT -eq $ATTEMPTS ]]; do echo -e "$(( COUNT++ ))... \c"; sleep 10; done + until $(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" cp go-ethereum:/root/transaction_info/STATEFUL_TEST_DEPLOYED_ADDRESS ./STATEFUL_TEST_DEPLOYED_ADDRESS) || [[ $COUNT -eq $ATTEMPTS ]]; do echo -e "$(( COUNT++ ))... \c"; sleep 10; done [[ $COUNT -eq $ATTEMPTS ]] && echo "Could not find the successful contract deployment" && (exit 1) cat ./STATEFUL_TEST_DEPLOYED_ADDRESS sleep 15; From 0ba7191564789aba78751b7b8ec08cc9f5c2d8b2 Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 15:21:39 -0400 Subject: [PATCH 6/7] missed final test also needing extra compose yml arg --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a2fb3ec3e489..c72dc0640bca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -135,7 +135,7 @@ jobs: - name: Make sure we see entries in the header table shell: bash run: | - rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids") + rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids") [[ "$rows" -lt "1" ]] && echo "We could not find any rows in postgres table." && (exit 1) echo $rows docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT * FROM eth.header_cids" From 8f2358aff40869be96bbc6357f04958caad209de Mon Sep 17 00:00:00 2001 From: Michael Shaw Date: Thu, 11 Aug 2022 15:41:49 -0400 Subject: [PATCH 7/7] missed final test also needing extra compose yml arg twice in this test --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c72dc0640bca..913ba07f9436 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -138,4 +138,4 @@ jobs: rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids") [[ "$rows" -lt "1" ]] && echo "We could not find any rows in postgres table." && (exit 1) echo $rows - docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT * FROM eth.header_cids" + docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT * FROM eth.header_cids"