From 28ddea13cf5c0801583088abf4e8cc4b5ce393fc Mon Sep 17 00:00:00 2001
From: Nikola <nikolaivanovj@gmail.com>
Date: Sun, 5 Jan 2025 20:19:50 +0000
Subject: [PATCH 1/7] adding build-push and compose .yml files

---
 .github/workflows/build-push.yml     | 37 ++++++++++++++++++++++++
 .github/workflows/docker-compose.yml |  9 ++++++
 .github/workflows/go.yml             | 42 ++++++++++++++--------------
 3 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/build-push.yml
 create mode 100644 .github/workflows/docker-compose.yml

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
new file mode 100644
index 0000000000..299d949862
--- /dev/null
+++ b/.github/workflows/build-push.yml
@@ -0,0 +1,37 @@
+name: Build and Push Docker Image
+
+# Adding a comment to trigger the workflow
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+    labels:
+      - CI:Build
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_PAT }}
+
+    - name: Set ENV Variable for Docker Compose
+      run: echo "DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}" >> $GITHUB_ENV
+
+    - name: Build and Push Docker Image
+      run: |
+        docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/go-ethereum:latest .
+        docker push ${{ secrets.DOCKER_HUB_USERNAME }}/go-ethereum:latest
+
diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml
new file mode 100644
index 0000000000..3b69d1cb9c
--- /dev/null
+++ b/.github/workflows/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '3.8'
+
+services:
+  geth:
+    image: "${{ secrets.DOCKER_HUB_USERNAME }}/go-ethereum:latest"
+    ports:
+      - "8545:8545"
+      - "30303:30303"
+
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 6406d2fa3d..5f44ed076b 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -1,24 +1,24 @@
 name: i386 linux tests
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
+# on:
+#   push:
+#     branches: [ master ]
+#   pull_request:
+#     branches: [ master ]
+#   workflow_dispatch:
 
-jobs:
-  build:
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.23.0
-          cache: false
-      - name: Run tests
-        run: go test -short ./...
-        env:
-          GOOS: linux
-          GOARCH: 386
+# jobs:
+#   build:
+#     runs-on: self-hosted
+#     steps:
+#       - uses: actions/checkout@v4
+#       - name: Set up Go
+#         uses: actions/setup-go@v5
+#         with:
+#           go-version: 1.23.0
+#           cache: false
+#       - name: Run tests
+#         run: go test -short ./...
+#         env:
+#           GOOS: linux
+#           GOARCH: 386

From 3ebeb6c7273a8de6002c5341bf359b2b4b95155c Mon Sep 17 00:00:00 2001
From: Nikola <nikolaivanovj@gmail.com>
Date: Sun, 5 Jan 2025 20:29:17 +0000
Subject: [PATCH 2/7] temp remove go.yml

---
 .github/workflows/go.yml | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 .github/workflows/go.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
deleted file mode 100644
index 5f44ed076b..0000000000
--- a/.github/workflows/go.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: i386 linux tests
-
-# on:
-#   push:
-#     branches: [ master ]
-#   pull_request:
-#     branches: [ master ]
-#   workflow_dispatch:
-
-# jobs:
-#   build:
-#     runs-on: self-hosted
-#     steps:
-#       - uses: actions/checkout@v4
-#       - name: Set up Go
-#         uses: actions/setup-go@v5
-#         with:
-#           go-version: 1.23.0
-#           cache: false
-#       - name: Run tests
-#         run: go test -short ./...
-#         env:
-#           GOOS: linux
-#           GOARCH: 386

From b1a56baebd8f1b99a3d4cce6f7b116947cd92492 Mon Sep 17 00:00:00 2001
From: nikolaivanovj <110764167+nikolaivanovj@users.noreply.github.com>
Date: Sun, 5 Jan 2025 20:34:23 +0000
Subject: [PATCH 3/7] Update build-push.yml

remove comment to check workflow
---
 .github/workflows/build-push.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 299d949862..8dc2d75df5 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -1,7 +1,5 @@
 name: Build and Push Docker Image
 
-# Adding a comment to trigger the workflow
-
 on:
   pull_request:
     types: [closed]

From 734c3284abca6255ea1d4acf37d40962116e27c1 Mon Sep 17 00:00:00 2001
From: Nikola <nikolaivanovj@gmail.com>
Date: Sun, 5 Jan 2025 20:38:11 +0000
Subject: [PATCH 4/7] push workflow

---
 .github/workflows/build-push.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 299d949862..8dc2d75df5 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -1,7 +1,5 @@
 name: Build and Push Docker Image
 
-# Adding a comment to trigger the workflow
-
 on:
   pull_request:
     types: [closed]

From 6070a1b54b58190231d13deb513cd291ccba76ee Mon Sep 17 00:00:00 2001
From: nikolaivanovj <110764167+nikolaivanovj@users.noreply.github.com>
Date: Sun, 5 Jan 2025 20:44:04 +0000
Subject: [PATCH 5/7] Update build-push.yml

---
 .github/workflows/build-push.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 8dc2d75df5..ade39d569b 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -2,7 +2,6 @@ name: Build and Push Docker Image
 
 on:
   pull_request:
-    types: [closed]
     branches:
       - main
     labels:
@@ -25,9 +24,6 @@ jobs:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_PAT }}
 
-    - name: Set ENV Variable for Docker Compose
-      run: echo "DOCKER_HUB_USERNAME=${{ secrets.DOCKER_HUB_USERNAME }}" >> $GITHUB_ENV
-
     - name: Build and Push Docker Image
       run: |
         docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/go-ethereum:latest .

From e2513a0a6a38db2c9950539f477c640397fae4b3 Mon Sep 17 00:00:00 2001
From: Nikola <nikolaivanovj@gmail.com>
Date: Sun, 5 Jan 2025 20:48:18 +0000
Subject: [PATCH 6/7] test changing branch

---
 .github/workflows/build-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 8dc2d75df5..450a31e624 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [closed]
     branches:
-      - main
+      - initialtest
     labels:
       - CI:Build
 

From 15e780fe7ce65543bd026a36970fcb060f83a99c Mon Sep 17 00:00:00 2001
From: Nikola <nikolaivanovj@gmail.com>
Date: Sun, 5 Jan 2025 20:53:00 +0000
Subject: [PATCH 7/7] changing branch to main again

---
 .github/workflows/build-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 734e929364..ade39d569b 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -3,7 +3,7 @@ name: Build and Push Docker Image
 on:
   pull_request:
     branches:
-      - initialtest
+      - main
     labels:
       - CI:Build