From 9da91a38d252abde7bdf743ab76302a60cfce476 Mon Sep 17 00:00:00 2001
From: dcorral <hi@dcorral.com>
Date: Thu, 6 Nov 2025 20:34:00 +0100
Subject: [PATCH] Merge actions

---
 .gitea/workflows/build-and-push.yml | 30 +++++++++++++++++++++-
 .gitea/workflows/e2e-test.yml       | 40 -----------------------------
 2 files changed, 29 insertions(+), 41 deletions(-)
 delete mode 100644 .gitea/workflows/e2e-test.yml

diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml
index cddfc8c..a552af2 100644
--- a/.gitea/workflows/build-and-push.yml
+++ b/.gitea/workflows/build-and-push.yml
@@ -1,4 +1,4 @@
-name: Build and Push Docker Image
+name: Build, Test and Push Docker Image
 
 on:
   push:
@@ -6,8 +6,36 @@ on:
       - master
 
 jobs:
+  e2e-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Build Docker image
+        run: docker build -t ssh-server-test .
+
+      - name: Run SSH server
+        run: |
+          docker run --rm -d --name ssh-server-test -p 2223:22 -e COMMAND="echo 'SSH connection successful'" ssh-server-test
+
+      - name: Wait for server to start
+        run: sleep 5
+
+      - name: Test SSH connection
+        run: |
+          output=$(ssh -p 2223 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@localhost "echo test")
+          if [ "$output" = "test" ]; then
+            echo "SSH connection test passed"
+          else
+            echo "SSH connection test failed"
+            exit 1
+          fi
+
   build-and-push:
     runs-on: ubuntu-latest
+    needs: e2e-test
 
     steps:
       - name: Checkout code
diff --git a/.gitea/workflows/e2e-test.yml b/.gitea/workflows/e2e-test.yml
deleted file mode 100644
index b1fe6fb..0000000
--- a/.gitea/workflows/e2e-test.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: E2E Test
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  e2e-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build Docker image
-        run: docker build -t ssh-server-test .
-
-      - name: Run SSH server
-        run: |
-          docker run -d --name ssh-server-test -p 2223:22 -e COMMAND="echo 'SSH connection successful'" ssh-server-test
-
-      - name: Wait for server to start
-        run: sleep 5
-
-      - name: Test SSH connection
-        run: |
-          output=$(ssh -p 2223 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@localhost "echo test")
-          if [ "$output" = "test" ]; then
-            echo "SSH connection test passed"
-          else
-            echo "SSH connection test failed"
-            exit 1
-          fi
-
-      - name: Cleanup
-        run: docker stop ssh-server-test
\ No newline at end of file