From 17c5b82d5828c41a5c68ad07572e4930e26cabe0 Mon Sep 17 00:00:00 2001
From: Govind Kumar <gkprmr@gmail.com>
Date: Tue, 10 Oct 2023 12:01:05 +0530
Subject: [PATCH] build: merge code lint and test both jobs in single workflow

---
 .../{code-lint.yml => code-review.yml}        | 27 ++++++---
 .github/workflows/code-test.yml               | 59 -------------------
 2 files changed, 19 insertions(+), 67 deletions(-)
 rename .github/workflows/{code-lint.yml => code-review.yml} (73%)
 delete mode 100644 .github/workflows/code-test.yml

diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-review.yml
similarity index 73%
rename from .github/workflows/code-lint.yml
rename to .github/workflows/code-review.yml
index e2078f788..b8d031f20 100644
--- a/.github/workflows/code-lint.yml
+++ b/.github/workflows/code-review.yml
@@ -1,4 +1,4 @@
-name: Code linting
+name: SUI 3 Codes review
 
 on:
   pull_request:
@@ -11,7 +11,7 @@ on:
       - master
 
 jobs:
-  code-linting:
+  fetch-repos:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sui-docs repository
@@ -24,12 +24,12 @@ jobs:
       - name: Grant execute permission for sui-docs
         run: chmod +x ./sui-docs
 
-#      - name: Checkout sui-css repository
-#        uses: actions/checkout@v3
-#        with:
-#          repository: wpmudev/sui-css
-#          path: ./sui-docs/packages/sui-css
-#          ref: development
+      #     - name: Checkout sui-css repository
+      #       uses: actions/checkout@v3
+      #       with:
+      #         repository: wpmudev/sui-css
+      #         path: ./sui-docs/packages/sui-css
+      #         ref: development
 
       - name: Checkout sui-icons repository
         uses: actions/checkout@v3
@@ -46,6 +46,10 @@ jobs:
       - name: List content
         run: pwd && ls
 
+  code-testing:
+    needs: [fetch-repos]
+    runs-on: ubuntu-latest
+    steps:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -54,6 +58,13 @@ jobs:
       - name: Install dependencies
         run: cd ./sui-docs && npm install --force
 
+      - name: Run tests
+        run: cd ./sui-docs && npm run test
+
+  code-linting:
+    needs: [fetch-repos]
+    runs-on: ubuntu-latest
+    steps:
       - name: Run eslint on changed files
         uses: tj-actions/eslint-changed-files@v21
         with:
diff --git a/.github/workflows/code-test.yml b/.github/workflows/code-test.yml
deleted file mode 100644
index dc3d875ac..000000000
--- a/.github/workflows/code-test.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Run tests
-
-on:
-  pull_request:
-    branches:
-      - development
-      - master
-  push:
-    branches:
-      - development
-      - master
-
-jobs:
-  code-testing:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout sui-docs repository
-        uses: actions/checkout@v3
-        with:
-          repository: wpmudev/sui-docs
-          path: ./sui-docs
-          ref: development
-
-      - name: Grant execute permission for sui-docs
-        run: chmod +x ./sui-docs
-
-#      - name: Checkout sui-css repository
-#        uses: actions/checkout@v3
-#        with:
-#          repository: wpmudev/sui-css
-#          path: ./sui-docs/packages/sui-css
-#          ref: development
-
-      - name: Checkout sui-icons repository
-        uses: actions/checkout@v3
-        with:
-          repository: wpmudev/sui-icons
-          path: ./sui-docs/packages/sui-icons
-          ref: development
-
-      - name: Checkout sui-react repository
-        uses: actions/checkout@v3
-        with:
-          path: ./sui-docs/packages/sui-react
-
-      - name: List content
-        run: pwd && ls
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-
-      - name: Install dependencies
-        run: cd ./sui-docs && npm install --force
-
-      - name: Run tests
-        run: cd ./sui-docs && npm run test