From 838c38207657fcf35835ad4bb9e9c67540a8e70f Mon Sep 17 00:00:00 2001
From: Maruf Bepary <bepary71@gmail.com>
Date: Mon, 20 Oct 2025 16:36:32 +0100
Subject: [PATCH 1/2] Added GitHub Actions workflow

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

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
new file mode 100644
index 0000000..51d570c
--- /dev/null
+++ b/.github/workflows/merge.yml
@@ -0,0 +1,111 @@
+name: Merging
+
+on:
+  pull_request:
+    branches: 
+      - main
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [22.13.0]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Detect package manager
+        id: detect-package-manager
+        run: |
+          if [ -f "${{ github.workspace }}/yarn.lock" ]; then
+            echo "manager=yarn" >> $GITHUB_OUTPUT
+            echo "command=install" >> $GITHUB_OUTPUT
+            echo "runner=yarn" >> $GITHUB_OUTPUT
+            exit 0
+          elif [ -f "${{ github.workspace }}/package.json" ]; then
+            echo "manager=npm" >> $GITHUB_OUTPUT
+            echo "command=ci" >> $GITHUB_OUTPUT
+            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
+            exit 0
+          else
+            echo "Unable to determine package manager"
+            exit 1
+          fi
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: ${{ steps.detect-package-manager.outputs.manager }}
+
+      - name: Install dependencies
+        run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
+
+      - name: Run Linter
+        run: ${{ steps.detect-package-manager.outputs.runner }} eslint '**/*.{js,ts,tsx}'
+
+  build:
+    needs: lint
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [22.13.0]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Detect package manager
+        id: detect-package-manager
+        run: |
+          if [ -f "${{ github.workspace }}/yarn.lock" ]; then
+            echo "manager=yarn" >> $GITHUB_OUTPUT
+            echo "command=install" >> $GITHUB_OUTPUT
+            echo "runner=yarn" >> $GITHUB_OUTPUT
+            exit 0
+          elif [ -f "${{ github.workspace }}/package.json" ]; then
+            echo "manager=npm" >> $GITHUB_OUTPUT
+            echo "command=ci" >> $GITHUB_OUTPUT
+            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
+            exit 0
+          else
+            echo "Unable to determine package manager"
+            exit 1
+          fi
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: ${{ steps.detect-package-manager.outputs.manager }}
+
+      - name: Install dependencies
+        run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
+
+      - name: Build 
+        run: ${{ steps.detect-package-manager.outputs.runner }} next build --turbopack
+
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
+      - name: Run Docker Compose
+        run: |
+          cd docker
+          docker-compose -f docker-compose.yml up -d
+
+      - name: Run tests
+        run: |
+          # Add your test commands here
+
+      - name: Stop Docker Compose
+        run: |
+          cd docker
+          docker-compose -f docker-compose.yml down
\ No newline at end of file

From aec7f547ccb8b596776781b6e2684f79c1517325 Mon Sep 17 00:00:00 2001
From: Maruf Bepary <bepary71@gmail.com>
Date: Mon, 20 Oct 2025 16:39:17 +0100
Subject: [PATCH 2/2] Removed Docker task

---
 .github/workflows/merge.yml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 51d570c..bf7ab92 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -84,28 +84,3 @@ jobs:
 
       - name: Build 
         run: ${{ steps.detect-package-manager.outputs.runner }} next build --turbopack
-
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Docker Compose
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y docker-compose
-
-      - name: Run Docker Compose
-        run: |
-          cd docker
-          docker-compose -f docker-compose.yml up -d
-
-      - name: Run tests
-        run: |
-          # Add your test commands here
-
-      - name: Stop Docker Compose
-        run: |
-          cd docker
-          docker-compose -f docker-compose.yml down
\ No newline at end of file