From e954370cd65ae3732827cff1199c7b0151ec9f1f Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Wed, 24 Apr 2024 17:45:53 +0800
Subject: [PATCH] update tests

---
 .gitea/workflows/test.yml | 26 +++-----------------------
 test/compose.yml          |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index a75ae67..91769a2 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -8,8 +8,6 @@ on:
       - main
 
 env:
-  # Needed until we can incorporate docker startup into the executor container
-  DOCKER_HOST: unix:///var/run/dind.sock
   CANONICAL_VERSION: v5.0.4-alpha
 
 jobs:
@@ -27,21 +25,12 @@ jobs:
         with:
           repository: cerc-io/eth-testing
           path: ./fixtures
-          ref: v0.3.1
-      - name: Configure Gitea access
-        env:
-          TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
-        run: |
-          git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
+          ref: v0.4.0
       - name: Build package
         run: go build .
       - name: Run unit tests
         run: make test
 
-      - name: Run dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
       - name: Run DB container
         run: docker compose -f test/compose.yml up --wait
 
@@ -59,7 +48,7 @@ jobs:
               ready_query='select max(version_id) from goose_db_version;'
               version=$(docker exec -e PGPASSWORD=password test-ipld-eth-db-1 \
                   psql -tA cerc_testing -U vdbm -c "$ready_query")
-              [[ "$version" -ge 18 ]]
+              [[ "$version" -ge 20 ]]
           do sleep 1; done
 
           ./ipld-eth-state-snapshot --config test/ci-config.toml stateSnapshot
@@ -90,12 +79,7 @@ jobs:
         with:
           repository: cerc-io/eth-testing
           path: ./fixtures
-          ref: v0.3.1
-      - name: Configure Gitea access
-        env:
-          TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
-        run: |
-          git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
+          ref: v0.4.0
       - name: Build current version
         working-directory: ./ipld-eth-state-snapshot
         run: go build -o ../snapshot-current .
@@ -109,10 +93,6 @@ jobs:
         working-directory: ./ipld-eth-state-snapshot-canonical
         run: go build -o ../snapshot-canonical .
 
-      - name: Run dockerd
-        run: |
-          dockerd -H $DOCKER_HOST --userland-proxy=false &
-          sleep 5
       - name: Run DB container
         working-directory: ./ipld-eth-state-snapshot
         run: docker compose -f test/compose.yml up --wait
diff --git a/test/compose.yml b/test/compose.yml
index f0b0d84..ae73a22 100644
--- a/test/compose.yml
+++ b/test/compose.yml
@@ -3,7 +3,7 @@ services:
     restart: on-failure
     depends_on:
       - ipld-eth-db
-    image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.5-alpha
+    image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.2.1-alpha
     environment:
       DATABASE_USER: "vdbm"
       DATABASE_NAME: "cerc_testing"