From d0f6cb0275366e4c4024f3ae8ee34c89d53b4f25 Mon Sep 17 00:00:00 2001
From: Mona Lisa <Mona.Lisa@abv.bg>
Date: Tue, 14 Nov 2023 06:39:43 -0500
Subject: [PATCH] fix

---
 .github/workflows/build-hardhat.yaml | 69 ++++++++++++++++------------
 docker-compose.yaml                  |  7 ++-
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/build-hardhat.yaml b/.github/workflows/build-hardhat.yaml
index b1f0006900..4ae528a89b 100644
--- a/.github/workflows/build-hardhat.yaml
+++ b/.github/workflows/build-hardhat.yaml
@@ -9,40 +9,49 @@ on:
  
 
 jobs:
-  hardhat-image-build:
-    if: ${{ github.event.label.name == 'CI:Deploy'}}
-    name: Build Hardhat image and push it to DockerHub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
+  # hardhat-image-build:
+  #   if: ${{ github.event.label.name == 'CI:Deploy'}}
+  #   name: Build Hardhat image and push it to DockerHub
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Check out the repo
+  #       uses: actions/checkout@v4
       
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN}}
+  #     - name: Log in to Docker Hub
+  #       uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+  #       with:
+  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
+  #         password: ${{ secrets.DOCKERHUB_TOKEN}}
       
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "anglyuboslav/hardhat:${{ github.run_number }}"
+  #     - name: Build and push Docker image
+  #       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+  #       with:
+  #         context: .
+  #         file: ./Dockerfile
+  #         push: true
+  #         tags: "anglyuboslav/hardhat:${{ github.run_number }}"
   hardhat-env:
-    name: Build hardhat devnet
+    # name: Build hardhat devnet
+    # runs-on: ubuntu-latest
+    # services:
+    #   go-eth:
+    #     image: anglyuboslav/go-eth-lab:12
+    #   hardhat:
+    #     image: anglyuboslav/hardhat:1.0.0
+    #     ports:
+    #       - 8545:8545
+    # steps:
+    #   - name: Run hardhat tests
+    #     run: docker exec hardhat bash -c "npx hardhat test"
+    name: "Integration testing"
     runs-on: ubuntu-latest
-    services:
-      go-eth:
-        image: anglyuboslav/go-eth-lab:12
-      hardhat:
-        image: anglyuboslav/hardhat:1.0.0
-        ports:
-          - 8545:8545
     steps:
-      - name: Run hardhat tests
-        run: docker exec hardhat bash -c "npx hardhat test"
-        
+      - uses: actions/checkout@v3
+      - name: "Set up environment"
+        run: docker compose -f docker-compose.yml up -d
+      # - name: "Wait for docker to finish building"
+      #   run: sleep 30
+      - name: "Test server"
+        run: docker exec go-ethereum-lab-hardhat-1 npx hardhat test
 
     
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 94448a84cd..90a805e1f8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,4 +3,9 @@ services:
   geth:
     image: anglyuboslav/go-eth-lab
     command: 
-      - --dev
\ No newline at end of file
+      - --dev
+  hardhat:
+    image: anglyuboslav/hardhat:1.0.0
+    ports:
+      - 8545:8545
+    
\ No newline at end of file