From b49353cab28d004f8e987647cbecfc6e88ebcc7c Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:04:10 +0500
Subject: [PATCH 01/22] Create test.yml

---
 .github/workflows/test.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..9be3f691
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,19 @@
+name: Logistics Pipeline
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main  # Change this to your main branch name if different
+
+jobs:
+    build:
+      runs-on: testing
+      steps:
+      
+        - name: Checkout code
+          uses: actions/checkout@v2
+
+        - name: Install dependencies
+          run: |
+            npm install

From a2a4ac5d567b3368c45d46e43572a10584ad9cc9 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:04:22 +0500
Subject: [PATCH 02/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9be3f691..1d4183bb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main  # Change this to your main branch name if different
+      - master  # Change this to your main branch name if different
 
 jobs:
     build:

From 8652de9bd23e8d08d77aae6d1508e28e0461c48b Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:05:39 +0500
Subject: [PATCH 03/22] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d4183bb..af93659a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
     build:
-      runs-on: testing
+      runs-on: self-hosted
       steps:
       
         - name: Checkout code
@@ -16,4 +16,4 @@ jobs:
 
         - name: Install dependencies
           run: |
-            npm install
+            ls

From 44f2ca0d5ec65fbfa2a73637c39511816f5336ab Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:14:22 +0500
Subject: [PATCH 04/22] Update test.yml

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af93659a..12c40146 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,5 @@ jobs:
 
         - name: Install dependencies
           run: |
-            ls
+            npm i
+            npm run build

From 1fc3beb4f823fc75ffd0af64b87db91d06034b79 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:20:07 +0500
Subject: [PATCH 05/22] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12c40146..ca109566 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,5 +16,5 @@ jobs:
 
         - name: Install dependencies
           run: |
-            npm i
-            npm run build
+            yarn
+            yarn build

From b4dcb44a495a83b806fdc448c5f7086d6ff58bc3 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:30:53 +0500
Subject: [PATCH 06/22] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ca109566..12c40146 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,5 +16,5 @@ jobs:
 
         - name: Install dependencies
           run: |
-            yarn
-            yarn build
+            npm i
+            npm run build

From 4b4114adf076501896b1e3ce8d8f55700be80dbb Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:38:35 +0500
Subject: [PATCH 07/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12c40146..e1ecec71 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,5 +16,4 @@ jobs:
 
         - name: Install dependencies
           run: |
-            npm i
-            npm run build
+           yarn

From d21ad02920082f445604dc5295ae96c3ca461a1b Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:42:31 +0500
Subject: [PATCH 08/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e1ecec71..f99bd35e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,4 @@ jobs:
 
         - name: Install dependencies
           run: |
-           yarn
+           npm -v

From d299b2a400b5af8fce62939c80ef1dc2a52d3498 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:55:01 +0500
Subject: [PATCH 09/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f99bd35e..cae4333f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,4 @@ jobs:
 
         - name: Install dependencies
           run: |
-           npm -v
+           C:\Users\Administrator\AppData\Roaming\npm -v

From 22414ed0da922e9379a2b877002a6c61fe424df4 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:05:04 +0500
Subject: [PATCH 10/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cae4333f..f99bd35e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,4 @@ jobs:
 
         - name: Install dependencies
           run: |
-           C:\Users\Administrator\AppData\Roaming\npm -v
+           npm -v

From 57268f3e614419c674b6abfc93091fc4f4273be6 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:10:02 +0500
Subject: [PATCH 11/22] Update test.yml

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f99bd35e..2d28defb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,4 +16,5 @@ jobs:
 
         - name: Install dependencies
           run: |
-           npm -v
+           npm i
+           npm run build

From 3b38a00fe3853e6c6c2037b002414a0319d265fd Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:12:25 +0500
Subject: [PATCH 12/22] Update test.yml

---
 .github/workflows/test.yml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2d28defb..fbe83f8a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,20 +1,29 @@
-name: Logistics Pipeline
+name: Build and Deploy
 
 on:
-  workflow_dispatch:
   push:
     branches:
-      - master  # Change this to your main branch name if different
+      - master
 
 jobs:
-    build:
-      runs-on: self-hosted
-      steps:
-      
-        - name: Checkout code
-          uses: actions/checkout@v2
+  build:
+    runs-on: ubuntu-latest
 
-        - name: Install dependencies
-          run: |
-           npm i
-           npm run build
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Build React app
+      run: npm run build
+
+  deploy:
+    runs-on: self-hosted
+    needs: build
+
+    steps:
+    - name: Copy build folder to self-hosted runner
+      run: |
+        cp -R build/* /path/to/self-hosted-runner-directory

From 14479ec63869c3061f37a11f53405e843eff14ea Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:14:09 +0500
Subject: [PATCH 13/22] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fbe83f8a..26a6fe07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Install dependencies
-      run: npm install
+      run: #npm install
 
     - name: Build React app
-      run: npm run build
+      run: mkdir build
 
   deploy:
     runs-on: self-hosted

From edcb549ba72b7761f86156b8f283bdb252bccff5 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:33:54 +0500
Subject: [PATCH 14/22] Update test.yml

---
 .github/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 26a6fe07..b4902932 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,16 +14,16 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Install dependencies
-      run: #npm install
+      run: #pm install
 
     - name: Build React app
-      run: mkdir build
+      run: npm run  build
 
   deploy:
-    runs-on: self-hosted
+    runs-on: shahzaib
     needs: build
 
     steps:
     - name: Copy build folder to self-hosted runner
       run: |
-        cp -R build/* /path/to/self-hosted-runner-directory
+        cp -R build/* C:\Users\Administrator\Desktop

From 4808b34204d992a85b7e47c11dc2336718608c4e Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:34:42 +0500
Subject: [PATCH 15/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4902932..3e408181 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Install dependencies
-      run: #pm install
+      run: npm install
 
     - name: Build React app
       run: npm run  build

From 905c8e8b8d36fc37898b9b1aa35522184e8c8d82 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:36:56 +0500
Subject: [PATCH 16/22] Update test.yml

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3e408181..8da0071f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Install dependencies
-      run: npm install
+      run: mkdir build
 
     - name: Build React app
-      run: npm run  build
+      run: cd build && echo "hello" > test.txt
 
   deploy:
     runs-on: shahzaib

From 86897752f64a711d68567366a5df759f5163d90d Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:40:06 +0500
Subject: [PATCH 17/22] Update test.yml

---
 .github/workflows/test.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8da0071f..7d064726 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,11 +19,22 @@ jobs:
     - name: Build React app
       run: cd build && echo "hello" > test.txt
 
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: build-artifacts
+        path: build
+
   deploy:
-    runs-on: shahzaib
+    runs-on: ubuntu-latest
     needs: build
 
     steps:
+    - name: Download build artifacts
+      uses: actions/download-artifact@v2
+      with:
+        name: build-artifacts
+
     - name: Copy build folder to self-hosted runner
       run: |
-        cp -R build/* C:\Users\Administrator\Desktop
+        cp -R ${{ github.workspace }}/build/* C:\Users\Administrator\Desktop

From 64771e6a3df91a85de8b2767a38fa4070bb26db5 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:41:21 +0500
Subject: [PATCH 18/22] Update test.yml

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7d064726..a41cc307 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,4 +37,5 @@ jobs:
 
     - name: Copy build folder to self-hosted runner
       run: |
-        cp -R ${{ github.workspace }}/build/* C:\Users\Administrator\Desktop
+        ls
+        #cp -R ${{ github.workspace }}/build/* C:\Users\Administrator\Desktop

From 63df1e1dd1c644aa22362751b18d74fb9df2d8b3 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:43:00 +0500
Subject: [PATCH 19/22] Update test.yml

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a41cc307..08568f58 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,4 +38,5 @@ jobs:
     - name: Copy build folder to self-hosted runner
       run: |
         ls
+        pwd
         #cp -R ${{ github.workspace }}/build/* C:\Users\Administrator\Desktop

From 62755928d39ca360b7eabb2900cbd9848a9d8308 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <67505288+shahzaib-khowaja@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:46:55 +0500
Subject: [PATCH 20/22] Update test.yml

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 08568f58..2f5b58cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
         path: build
 
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: shahzaib
     needs: build
 
     steps:

From 09d865553f1ddea436c5f6dde44bc6a98b6f109d Mon Sep 17 00:00:00 2001
From: devops <shahzaib.k@maleyat.com>
Date: Mon, 8 Jan 2024 12:35:36 +0500
Subject: [PATCH 21/22] changes

---
 .vscode/settings.json | 5 ++++-
 Jenkinsfile           | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 49880a2f..d2357bcc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,5 +3,8 @@
     "prettier.configPath": "",
     "prettier.useTabs": true,
     "prettier.withNodeModules": true,
-    "prettier.vueIndentScriptAndStyle": false
+    "prettier.vueIndentScriptAndStyle": false,
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "master"
+    ]
 }
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 10988103..c614cde9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,7 @@ pipeline {
                 sh './scripts/deploy-for-production.sh'
                 input message: 'Finished using the web site? (Click "Proceed" to continue)'
                 sh './scripts/kill.sh'
+                sh 'ls'
             }
         }
     }

From c8f2ddbeb3cea2a33a791ff307f4d542c421f712 Mon Sep 17 00:00:00 2001
From: shahzaib-khowaja <shahzaib.kkhowaja@gmail.com>
Date: Mon, 8 Jan 2024 20:49:21 +0500
Subject: [PATCH 22/22] yes

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c614cde9..be4f3335 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
             agent {
                 docker {
                     image 'node:lts-alpine'
-                    args '-u root:root'
+                    args '-u root:root'sasasdsa
                 }
             }
             steps{