From f29735cdae91a4c9ff6bbb91cdd53f2bfba7d4b3 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Tue, 7 Jan 2025 17:25:18 +0530 Subject: [PATCH 01/18] adding deployement file to generate jar in github and deploy it on staging. --- .../NMSReportingSuite-deployment.yaml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/NMSReportingSuite-deployment.yaml diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml new file mode 100644 index 00000000..acb09fe0 --- /dev/null +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -0,0 +1,66 @@ +name: Build and Deploy to Staging + +on: + push: + branches: + - sms-properties-changes + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + + steps: + # Step 1: Check out the code + - name: Checkout Code + uses: actions/checkout@v3 + + # Step 2: Set up Java + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '8' # Specify your Java version + + # Step 3: Build the JAR + - name: Build with Maven + run: mvn clean intsall + + # Step 4 : shutdown tomcat if it is started + - name: Shutdown Tomcat if it is up + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is running. Shutting it down..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh + else + echo "Tomcat is not running." + fi + + # Step 5: Deploy to Staging Server + - name: Deploy to Staging + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + source: "NMSReportingSuite/target/*.war" + target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps + + # Step 6: Restart Application (if needed) + - name: Restart tomcat + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is not running. Starting it up..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh + else + echo "Tomcat is already running." + fi + From 52772756a9c9be22cb3d1cb48363c079c4140692 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Tue, 7 Jan 2025 17:30:49 +0530 Subject: [PATCH 02/18] change branch name deployment --- .../NMSReportingSuite-deployment.yaml | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index acb09fe0..841e6833 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -1,66 +1,66 @@ name: Build and Deploy to Staging on: - push: - branches: - - sms-properties-changes + push: + branches: + - deployment jobs: - build-and-deploy: - runs-on: ubuntu-latest + build-and-deploy: + runs-on: ubuntu-latest - steps: - # Step 1: Check out the code - - name: Checkout Code - uses: actions/checkout@v3 + steps: + # Step 1: Check out the code + - name: Checkout Code + uses: actions/checkout@v3 - # Step 2: Set up Java - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '8' # Specify your Java version + # Step 2: Set up Java + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '8' # Specify your Java version - # Step 3: Build the JAR - - name: Build with Maven - run: mvn clean intsall - - # Step 4 : shutdown tomcat if it is started - - name: Shutdown Tomcat if it is up - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - script: | - if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is running. Shutting it down..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh - else - echo "Tomcat is not running." - fi + # Step 3: Build the JAR + - name: Build with Maven + run: mvn clean install - # Step 5: Deploy to Staging Server - - name: Deploy to Staging - uses: appleboy/scp-action@v0.1.4 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - source: "NMSReportingSuite/target/*.war" - target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps + # Step 4: Shutdown Tomcat if it is started + - name: Shutdown Tomcat if it is up + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is running. Shutting it down..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh + else + echo "Tomcat is not running." + fi - # Step 6: Restart Application (if needed) - - name: Restart tomcat - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - script: | - if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is not running. Starting it up..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh - else - echo "Tomcat is already running." - fi + # Step 5: Deploy to Staging Server + - name: Deploy to Staging + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + source: "NMSReportingSuite/target/*.war" + target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps + + # Step 6: Restart Application (if needed) + - name: Restart Tomcat + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is not running. Starting it up..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh + else + echo "Tomcat is already running." + fi From 09cb916585c048fdb32bc8a13833891b92733f46 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Tue, 7 Jan 2025 18:07:42 +0530 Subject: [PATCH 03/18] corrected indetation. --- .../NMSReportingSuite-deployment.yaml | 121 +++++++++--------- 1 file changed, 59 insertions(+), 62 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 841e6833..a5d98b25 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -1,66 +1,63 @@ name: Build and Deploy to Staging - on: - push: - branches: - - deployment + push: + branches: + - deployment jobs: - build-and-deploy: - runs-on: ubuntu-latest - - steps: - # Step 1: Check out the code - - name: Checkout Code - uses: actions/checkout@v3 - - # Step 2: Set up Java - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '8' # Specify your Java version - - # Step 3: Build the JAR - - name: Build with Maven - run: mvn clean install - - # Step 4: Shutdown Tomcat if it is started - - name: Shutdown Tomcat if it is up - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - script: | - if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is running. Shutting it down..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh - else - echo "Tomcat is not running." - fi - - # Step 5: Deploy to Staging Server - - name: Deploy to Staging - uses: appleboy/scp-action@v0.1.4 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - source: "NMSReportingSuite/target/*.war" - target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps - - # Step 6: Restart Application (if needed) - - name: Restart Tomcat - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} - script: | - if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is not running. Starting it up..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh - else - echo "Tomcat is already running." - fi - + build-and-deploy: + runs-on: ubuntu-latest + steps: + # Step 1: Check out the code + - name: Checkout repository + uses: actions/checkout@v3 + + # Step 2: Set up Java + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '8' + + # Step 3: Build the JAR + - name: Build with Maven + run: mvn clean install + + # Step 4: Shutdown Tomcat if it is started + - name: Shutdown Tomcat if it is up + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is running. Shutting it down..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh + else + echo "Tomcat is not running." + fi + + # Step 5: Deploy to Staging Server + - name: Deploy to Staging + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + source: "NMSReportingSuite/target/*.war" + target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps + + # Step 6: Restart Application (if needed) + - name: Restart Tomcat + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.STAGING_HOST }} + username: ${{ secrets.STAGING_USER }} + key: ${{ secrets.STAGING_KEY }} + script: | + if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then + echo "Tomcat is not running. Starting it up..." + sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh + else + echo "Tomcat is already running." + fi From d9d56d04846440d30e022d0d14a816988217f59e Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 11:46:48 +0530 Subject: [PATCH 04/18] ubuntu version change --- .github/workflows/NMSReportingSuite-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index a5d98b25..4c1d3417 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -6,7 +6,7 @@ on: jobs: build-and-deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: # Step 1: Check out the code - name: Checkout repository From bd7c0ebe5ff4fca3e15ebb22d5507cc27af2d11f Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 11:50:08 +0530 Subject: [PATCH 05/18] added a distributiion --- .github/workflows/NMSReportingSuite-deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 4c1d3417..a4f717d5 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: '8' + distribution: 'temurin' # Step 3: Build the JAR - name: Build with Maven From d9efaa3e3e672186c256bfe6fd7f084d5d8e96d2 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 12:22:52 +0530 Subject: [PATCH 06/18] pom file path change --- .github/workflows/NMSReportingSuite-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index a4f717d5..3a71951c 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -21,7 +21,7 @@ jobs: # Step 3: Build the JAR - name: Build with Maven - run: mvn clean install + run: mvn clean install -f NMSReportingSuite/pom.xml # Step 4: Shutdown Tomcat if it is started - name: Shutdown Tomcat if it is up From 4d778644753982c935c6fe503b4566634d56746f Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 13:01:05 +0530 Subject: [PATCH 07/18] change staging key ref --- .github/workflows/NMSReportingSuite-deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 3a71951c..9dfdc880 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -29,7 +29,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} + key: ${{ secrets.STAGING_PASSWORD }} script: | if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then echo "Tomcat is running. Shutting it down..." @@ -44,7 +44,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} + key: ${{ secrets.STAGING_PASSWORD }} source: "NMSReportingSuite/target/*.war" target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps @@ -54,7 +54,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_KEY }} + key: ${{ secrets.STAGING_PASSWORD }} script: | if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then echo "Tomcat is not running. Starting it up..." From ec153f41b0701df7f62780fbc2ece1655f45c1ba Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 13:06:59 +0530 Subject: [PATCH 08/18] change key to password --- .github/workflows/NMSReportingSuite-deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 9dfdc880..a6019f24 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -29,7 +29,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_PASSWORD }} + password: ${{ secrets.STAGING_PASSWORD }} script: | if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then echo "Tomcat is running. Shutting it down..." @@ -44,7 +44,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_PASSWORD }} + password: ${{ secrets.STAGING_PASSWORD }} source: "NMSReportingSuite/target/*.war" target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps @@ -54,7 +54,7 @@ jobs: with: host: ${{ secrets.STAGING_HOST }} username: ${{ secrets.STAGING_USER }} - key: ${{ secrets.STAGING_PASSWORD }} + password: ${{ secrets.STAGING_PASSWORD }} script: | if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then echo "Tomcat is not running. Starting it up..." From 0f2c5b1473e938ce04bff0a9fc2498203e709b92 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 13:18:18 +0530 Subject: [PATCH 09/18] removed step 4-6 --- .../NMSReportingSuite-deployment.yaml | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index a6019f24..19592e46 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,42 +23,3 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml - # Step 4: Shutdown Tomcat if it is started - - name: Shutdown Tomcat if it is up - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - password: ${{ secrets.STAGING_PASSWORD }} - script: | - if pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is running. Shutting it down..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/shutdown.sh - else - echo "Tomcat is not running." - fi - - # Step 5: Deploy to Staging Server - - name: Deploy to Staging - uses: appleboy/scp-action@v0.1.4 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - password: ${{ secrets.STAGING_PASSWORD }} - source: "NMSReportingSuite/target/*.war" - target: /usr/local/tomcat/apache-tomcat-7.0.108/webapps - - # Step 6: Restart Application (if needed) - - name: Restart Tomcat - uses: appleboy/ssh-action@v0.1.6 - with: - host: ${{ secrets.STAGING_HOST }} - username: ${{ secrets.STAGING_USER }} - password: ${{ secrets.STAGING_PASSWORD }} - script: | - if ! pgrep -f "org.apache.catalina.startup.Bootstrap" > /dev/null; then - echo "Tomcat is not running. Starting it up..." - sh /usr/local/tomcat/apache-tomcat-7.0.108/bin/startup.sh - else - echo "Tomcat is already running." - fi From 7326b28890679915f7d21c5256bead910485fb6c Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 13:29:42 +0530 Subject: [PATCH 10/18] added artifact --- .github/workflows/NMSReportingSuite-deployment.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 19592e46..01e3049f 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,3 +23,13 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml + - uses: actions/upload-artifact@v4 + with: + name: my-artifact + path: NMSReportingSuite/pom.xml + + - uses: actions/download-artifact@v4 + with: + name: my-artifact + path: NMSReportingSuite/ + From bb308e8288aed46a3cb71b4aabb3896be05ccf10 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 13:33:39 +0530 Subject: [PATCH 11/18] change path --- .github/workflows/NMSReportingSuite-deployment.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 01e3049f..abca4dd1 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -26,10 +26,6 @@ jobs: - uses: actions/upload-artifact@v4 with: name: my-artifact - path: NMSReportingSuite/pom.xml + path: NMSReportingSuite/target/*.war - - uses: actions/download-artifact@v4 - with: - name: my-artifact - path: NMSReportingSuite/ From 5427283f88408967423b16236d279104183cf7ff Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 14:53:59 +0530 Subject: [PATCH 12/18] adding frontend in yaml --- .github/workflows/NMSReportingSuite-deployment.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index abca4dd1..8436aca6 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,9 +23,18 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml + # Step 4: Build FrontEnd JS files + - name: Install Frontend Dependencies and Build with Grunt + run: | + cd app + grunt package + + # Step 5: Download Action Button - uses: actions/upload-artifact@v4 with: name: my-artifact - path: NMSReportingSuite/target/*.war + path: | + NMSReportingSuite/target/*.war + app/* From 3b79635ec56050af8bf439cabef4c98173e4c3fd Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 14:57:55 +0530 Subject: [PATCH 13/18] grunt cli --- .github/workflows/NMSReportingSuite-deployment.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 8436aca6..084c7852 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,7 +23,12 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml - # Step 4: Build FrontEnd JS files + # Step 4: Install Grunt CLI + - name: Install Grunt CLI + run: | + npm install -g grunt-cli + + # Step 5: Build FrontEnd files - name: Install Frontend Dependencies and Build with Grunt run: | cd app From 31d106fec145f7136f174faa2a9ffa4cb693b1b9 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 15:03:36 +0530 Subject: [PATCH 14/18] conditional statement for grunt cli --- .github/workflows/NMSReportingSuite-deployment.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 084c7852..41568803 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,10 +23,14 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml - # Step 4: Install Grunt CLI + # Step 4: Install Grunt CLI only if not already installed - name: Install Grunt CLI run: | - npm install -g grunt-cli + if ! command -v grunt &> /dev/null; then + npm install -g grunt-cli + else + echo "Grunt CLI is already installed" + fi # Step 5: Build FrontEnd files - name: Install Frontend Dependencies and Build with Grunt From d48ee3cc4908caa8530950cecc5628cb76f8416c Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 15:08:06 +0530 Subject: [PATCH 15/18] npm install --- .github/workflows/NMSReportingSuite-deployment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 41568803..517a94d2 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -35,8 +35,9 @@ jobs: # Step 5: Build FrontEnd files - name: Install Frontend Dependencies and Build with Grunt run: | - cd app - grunt package + cd app + npm install + grunt package # Step 5: Download Action Button - uses: actions/upload-artifact@v4 From e9ed6e3c7789799f58a416696da43c264384f7fb Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 15:30:30 +0530 Subject: [PATCH 16/18] path change to get files --- .github/workflows/NMSReportingSuite-deployment.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 517a94d2..33162df5 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -45,6 +45,10 @@ jobs: name: my-artifact path: | NMSReportingSuite/target/*.war - app/* + app/index.html + app/scripts/ + app/views/ + app/styles/ + app/dist/ From 78594daf7004b8c6b93f9cc74ca76af5dff95263 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 15:47:45 +0530 Subject: [PATCH 17/18] removed install grunt cli. --- .github/workflows/NMSReportingSuite-deployment.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/NMSReportingSuite-deployment.yaml b/.github/workflows/NMSReportingSuite-deployment.yaml index 33162df5..339b819f 100644 --- a/.github/workflows/NMSReportingSuite-deployment.yaml +++ b/.github/workflows/NMSReportingSuite-deployment.yaml @@ -23,23 +23,14 @@ jobs: - name: Build with Maven run: mvn clean install -f NMSReportingSuite/pom.xml - # Step 4: Install Grunt CLI only if not already installed - - name: Install Grunt CLI - run: | - if ! command -v grunt &> /dev/null; then - npm install -g grunt-cli - else - echo "Grunt CLI is already installed" - fi - - # Step 5: Build FrontEnd files + # Step 4: Build FrontEnd - name: Install Frontend Dependencies and Build with Grunt run: | cd app npm install grunt package - # Step 5: Download Action Button + # Step 5: Store deployment data - uses: actions/upload-artifact@v4 with: name: my-artifact From 9b26e6dbb8d526ebbed089c1e806cf24c6617533 Mon Sep 17 00:00:00 2001 From: Mandar-Beehyv Date: Wed, 8 Jan 2025 16:12:40 +0530 Subject: [PATCH 18/18] change in window location --- app/index.html | 2 +- app/views/aboutKilkari.html | 2 +- app/views/aboutMA.html | 2 +- app/views/aboutUs.html | 2 +- app/views/bulkUser.html | 2 +- app/views/certificate.html | 2 +- app/views/changePassword.html | 2 +- app/views/contactUs.html | 2 +- app/views/contactUsResponse.html | 2 +- app/views/copyrightPolicy.html | 2 +- app/views/createUser.html | 2 +- app/views/disclaimer.html | 2 +- app/views/downloads.html | 2 +- app/views/editUser.html | 2 +- app/views/faq.html | 2 +- app/views/faqAggregateInfo.html | 2 +- app/views/faqGeneralInfo.html | 2 +- app/views/faqLineListingInfo.html | 2 +- app/views/faqLoginInfo.html | 2 +- app/views/faqReportsInfo.html | 2 +- app/views/feedbackForm.html | 2 +- app/views/feedbackResponse.html | 2 +- app/views/forgotPassword.html | 2 +- app/views/helpPage.html | 2 +- app/views/home.html | 2 +- app/views/hyperLinkingPolicy.html | 2 +- app/views/login.html | 2 +- app/views/pagination.html | 2 +- app/views/privacyPolicy.html | 2 +- app/views/profile.html | 2 +- app/views/reports.html | 2 +- app/views/sitemap.html | 2 +- app/views/tAndC.html | 2 +- app/views/userManagement.html | 2 +- app/views/userManual.html | 2 +- app/views/userManual_Management.html | 2 +- app/views/userManual_Profile.html | 2 +- app/views/userManual_kilkari.html | 2 +- app/views/userManual_kilkariAgg.html | 2 +- app/views/userManual_mobileAcademy.html | 2 +- app/views/userManual_mobileAcademyAgg.html | 2 +- app/views/userManual_websiteInformation.html | 2 +- app/views/userTable.html | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/index.html b/app/index.html index 06b2136a..437f97e9 100644 --- a/app/index.html +++ b/app/index.html @@ -16,7 +16,7 @@ diff --git a/app/views/aboutKilkari.html b/app/views/aboutKilkari.html index 801021b4..621cc3e3 100644 --- a/app/views/aboutKilkari.html +++ b/app/views/aboutKilkari.html @@ -1,6 +1,6 @@
diff --git a/app/views/aboutMA.html b/app/views/aboutMA.html index 51d5a43a..6cc66fba 100644 --- a/app/views/aboutMA.html +++ b/app/views/aboutMA.html @@ -1,6 +1,6 @@
diff --git a/app/views/aboutUs.html b/app/views/aboutUs.html index c15fc422..ffb534af 100644 --- a/app/views/aboutUs.html +++ b/app/views/aboutUs.html @@ -1,6 +1,6 @@
diff --git a/app/views/bulkUser.html b/app/views/bulkUser.html index c14ab22b..9d4142dc 100644 --- a/app/views/bulkUser.html +++ b/app/views/bulkUser.html @@ -1,6 +1,6 @@
diff --git a/app/views/certificate.html b/app/views/certificate.html index 227a5a7e..20ca1646 100644 --- a/app/views/certificate.html +++ b/app/views/certificate.html @@ -1,6 +1,6 @@ diff --git a/app/views/changePassword.html b/app/views/changePassword.html index cca7f940..800603c7 100644 --- a/app/views/changePassword.html +++ b/app/views/changePassword.html @@ -1,6 +1,6 @@
diff --git a/app/views/contactUs.html b/app/views/contactUs.html index 82c463c7..524cf9bc 100644 --- a/app/views/contactUs.html +++ b/app/views/contactUs.html @@ -1,6 +1,6 @@
diff --git a/app/views/contactUsResponse.html b/app/views/contactUsResponse.html index e0597cfd..d3a0bb18 100644 --- a/app/views/contactUsResponse.html +++ b/app/views/contactUsResponse.html @@ -1,6 +1,6 @@
diff --git a/app/views/copyrightPolicy.html b/app/views/copyrightPolicy.html index f2e795f1..211cf5e5 100644 --- a/app/views/copyrightPolicy.html +++ b/app/views/copyrightPolicy.html @@ -1,6 +1,6 @@
diff --git a/app/views/createUser.html b/app/views/createUser.html index 5db23f1e..cf3fde6a 100644 --- a/app/views/createUser.html +++ b/app/views/createUser.html @@ -1,6 +1,6 @@
diff --git a/app/views/disclaimer.html b/app/views/disclaimer.html index fe1535a8..d1881c3b 100644 --- a/app/views/disclaimer.html +++ b/app/views/disclaimer.html @@ -1,6 +1,6 @@
diff --git a/app/views/downloads.html b/app/views/downloads.html index 10345b3f..6748f6ab 100644 --- a/app/views/downloads.html +++ b/app/views/downloads.html @@ -1,6 +1,6 @@
diff --git a/app/views/editUser.html b/app/views/editUser.html index 3664a070..32c65b53 100644 --- a/app/views/editUser.html +++ b/app/views/editUser.html @@ -1,6 +1,6 @@
diff --git a/app/views/faq.html b/app/views/faq.html index 4540b634..205414be 100644 --- a/app/views/faq.html +++ b/app/views/faq.html @@ -1,6 +1,6 @@
diff --git a/app/views/faqAggregateInfo.html b/app/views/faqAggregateInfo.html index d6ef19e7..380d0abe 100644 --- a/app/views/faqAggregateInfo.html +++ b/app/views/faqAggregateInfo.html @@ -1,6 +1,6 @@
diff --git a/app/views/faqGeneralInfo.html b/app/views/faqGeneralInfo.html index ffac4112..4df8099a 100644 --- a/app/views/faqGeneralInfo.html +++ b/app/views/faqGeneralInfo.html @@ -1,6 +1,6 @@
diff --git a/app/views/faqLineListingInfo.html b/app/views/faqLineListingInfo.html index 454822ec..ebd50f31 100644 --- a/app/views/faqLineListingInfo.html +++ b/app/views/faqLineListingInfo.html @@ -1,6 +1,6 @@
diff --git a/app/views/faqLoginInfo.html b/app/views/faqLoginInfo.html index cf0b6eaf..ddb623b7 100644 --- a/app/views/faqLoginInfo.html +++ b/app/views/faqLoginInfo.html @@ -1,6 +1,6 @@
diff --git a/app/views/faqReportsInfo.html b/app/views/faqReportsInfo.html index 0d56e3ee..2e68c1a0 100644 --- a/app/views/faqReportsInfo.html +++ b/app/views/faqReportsInfo.html @@ -1,6 +1,6 @@
diff --git a/app/views/feedbackForm.html b/app/views/feedbackForm.html index cde4d1c3..f0aab244 100644 --- a/app/views/feedbackForm.html +++ b/app/views/feedbackForm.html @@ -1,6 +1,6 @@
diff --git a/app/views/feedbackResponse.html b/app/views/feedbackResponse.html index 9b9b40bc..2a5b8dba 100644 --- a/app/views/feedbackResponse.html +++ b/app/views/feedbackResponse.html @@ -1,6 +1,6 @@
diff --git a/app/views/forgotPassword.html b/app/views/forgotPassword.html index a61ae207..2eb7d572 100644 --- a/app/views/forgotPassword.html +++ b/app/views/forgotPassword.html @@ -1,6 +1,6 @@
diff --git a/app/views/helpPage.html b/app/views/helpPage.html index 40667fa5..8a7a8925 100644 --- a/app/views/helpPage.html +++ b/app/views/helpPage.html @@ -1,6 +1,6 @@
diff --git a/app/views/home.html b/app/views/home.html index c1920f73..7966ce63 100644 --- a/app/views/home.html +++ b/app/views/home.html @@ -1,6 +1,6 @@
diff --git a/app/views/hyperLinkingPolicy.html b/app/views/hyperLinkingPolicy.html index 763f831c..7843e0db 100644 --- a/app/views/hyperLinkingPolicy.html +++ b/app/views/hyperLinkingPolicy.html @@ -1,6 +1,6 @@
diff --git a/app/views/login.html b/app/views/login.html index 11e8e160..ded5f17e 100644 --- a/app/views/login.html +++ b/app/views/login.html @@ -1,6 +1,6 @@