From 474952b7ee081509ae1fccface36130f14c6134b Mon Sep 17 00:00:00 2001
From: ismay <ismay@dhis2.org>
Date: Mon, 10 Jun 2024 15:55:06 +0200
Subject: [PATCH] ci: abstract test

---
 .github/workflows/dhis2-verify-app.yml | 51 +-------------------------
 .github/workflows/test.yml             | 15 ++++++++
 2 files changed, 17 insertions(+), 49 deletions(-)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
index c431fb70..2c7200b8 100644
--- a/.github/workflows/dhis2-verify-app.yml
+++ b/.github/workflows/dhis2-verify-app.yml
@@ -1,19 +1,10 @@
 name: 'dhis2: verify (app)'
 
-# Requirements:
-#
-# - Org secrets:
-#       DHIS2_BOT_GITHUB_TOKEN
-#       DHIS2_BOT_APPHUB_TOKEN
-# - Enable the 'jobs.e2e' section if applicable
-# - Customize the properties if needed:
-#       'jobs.release.steps.*.cwd'
-#       'jobs.release.steps.*.build-dir'
-
 on: push
 
 concurrency:
     group: ${{ github.workflow}}-${{ github.ref }}
+    cancel-in-progress: true
 
 env:
     GIT_AUTHOR_NAME: '@dhis2-bot'
@@ -23,49 +14,11 @@ env:
     D2_VERBOSE: true
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v3
-              with:
-                  node-version: 20
-                  cache: 'yarn'
-
-            - run: yarn install --frozen-lockfile
-
-            - name: Build
-              run: yarn d2-app-scripts build
-
-            - uses: actions/upload-artifact@v2
-              with:
-                  name: app-build
-                  path: |
-                      **/build
-                      !**/node_modules
-                  retention-days: 1
-
     lint:
         uses: ./.github/workflows/lint.yml
 
     test:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: actions/setup-node@v3
-              with:
-                  node-version: 20
-                  cache: 'yarn'
-
-            - run: yarn install --frozen-lockfile
-
-            # Can be removed if translations aren't required for tests,
-            # or if not using the App Platform
-            - name: Generate translations
-              run: yarn d2-app-scripts i18n generate
-
-            - name: Test
-              run: yarn d2-app-scripts test
+        uses: ./.github/workflows/test.yml
 
     e2e:
         runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..90158e17
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,15 @@
+on:
+    workflow_call:
+
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: 'yarn'
+            - run: yarn install --frozen-lockfile
+            - run: yarn d2-app-scripts i18n generate
+            - run: yarn d2-app-scripts test