From 13c4ccc0fca9928061c94b85d8b5246617eaba36 Mon Sep 17 00:00:00 2001
From: mama-samba-braima <djalonelson@gmail.com>
Date: Mon, 14 Jul 2025 18:29:58 +0100
Subject: [PATCH 1/2] run mvn clean verify if no build number

---
 .github/workflows/deploy.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2313fa0..943592f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,8 +1,14 @@
 name: Deploy Workflow
 on:
-  push:
+  pull_request:
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      build_number:
+        description: "Docker image tag to be deployed"
+        required: true
+        default: ""
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -24,9 +30,14 @@ jobs:
           java-version: '21'
       - name: Generate Build Number
         run: |
-          BUILD_NUMBER=$(date +'%d%m%Y%H%M%S')
+          if [ -z "${{ github.event.inputs.build_number }}"]; then
+            BUILD_NUMBER=$(date +'%d%m%Y%H%M%S')
+            echo "No build number provided. Using $BUILD_NUMBER"
+          else
+            BUILD_NUMBER="${{ github.event.inputs.build_number }}"
+            echo "Using provided build number $BUILD_NUMBER"
+          fi
           echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
-          echo "Generated Build Number: $BUILD_NUMBER"
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -43,9 +54,10 @@ jobs:
           ssh -o StrictHostKeyChecking=no ec2-user@$EC2_PUBLIC_IP_ADDRESS << EOF
             cd ~
             sed -i 's|image: '"$DOCKER_USERNAME"'/'"$DOCKER_IMAGE_NAME"':.*$|image: '"$DOCKER_USERNAME"'/'"$DOCKER_IMAGE_NAME"':'"$BUILD_NUMBER"'|' docker-compose.yml
+            sed -i "s|image: .*$|image: ${DOCKER_USERNAME}/${DOCKER_IMAGE_NAME}:$BUILD_NUMBER|" docker-compose.yml
             docker-compose pull
             docker-compose up -d '$DOCKER_COMPOSE_APP_SERVICE_NAME'
             docker image prune -f
             docker ps
             echo "$BUILD_NUMBER" > build-number.txt
-          EOF
+          EOF
\ No newline at end of file

From 07f7745847549db5dcf1608f7074799d1f90dfbc Mon Sep 17 00:00:00 2001
From: mama-samba-braima <djalonelson@gmail.com>
Date: Mon, 14 Jul 2025 18:34:26 +0100
Subject: [PATCH 2/2] run mvn clean verify if no build number

---
 .github/workflows/deploy.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 943592f..3de16bb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,6 +1,6 @@
 name: Deploy Workflow
 on:
-  pull_request:
+  push:
     branches:
       - main
   workflow_dispatch:
@@ -54,7 +54,6 @@ jobs:
           ssh -o StrictHostKeyChecking=no ec2-user@$EC2_PUBLIC_IP_ADDRESS << EOF
             cd ~
             sed -i 's|image: '"$DOCKER_USERNAME"'/'"$DOCKER_IMAGE_NAME"':.*$|image: '"$DOCKER_USERNAME"'/'"$DOCKER_IMAGE_NAME"':'"$BUILD_NUMBER"'|' docker-compose.yml
-            sed -i "s|image: .*$|image: ${DOCKER_USERNAME}/${DOCKER_IMAGE_NAME}:$BUILD_NUMBER|" docker-compose.yml
             docker-compose pull
             docker-compose up -d '$DOCKER_COMPOSE_APP_SERVICE_NAME'
             docker image prune -f