From 4bdb11aadc1b730e3334b18daf8848694ac2ee4e Mon Sep 17 00:00:00 2001
From: Naeem Akhter <akhternaeem@gmail.com>
Date: Tue, 22 Mar 2022 18:42:43 +0500
Subject: [PATCH] Change the sequence regressions, moved installcheck-world to
 last to make sure that we already have ran the pg_stat_monitor regression and
 server regression don't imapct it.

---
 .github/workflows/postgresql-11-build.yml | 30 +++++++++++------------
 .github/workflows/postgresql-12-build.yml | 29 +++++++++++-----------
 .github/workflows/postgresql-13-build.yml | 29 +++++++++++-----------
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/postgresql-11-build.yml b/.github/workflows/postgresql-11-build.yml
index 1853c94..6198e5d 100644
--- a/.github/workflows/postgresql-11-build.yml
+++ b/.github/workflows/postgresql-11-build.yml
@@ -83,21 +83,6 @@ jobs:
           /usr/lib/postgresql/11/bin/pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor/
 
-      - name: Start Server installcheck-world tests (without TAP)
-        run: |
-          make installcheck-world
-
-      - name: Report on installcheck-world test suites fail
-        uses: actions/upload-artifact@v2
-        if: ${{ failure() }}
-        with:
-          name: Regressions output files of failed testsuite, and postgresql log
-          path: |
-            **/regression.diffs
-            **/regression.out
-            src/pg_stat_monitor/logfile
-          retention-days: 1
-
       - name: Start pg_stat_monitor_tests
         run: |
           make installcheck
@@ -112,3 +97,18 @@ jobs:
             src/pg_stat_monitor/regression.diffs
             src/pg_stat_monitor/logfile
           retention-days: 1
+
+      - name: Start Server installcheck-world tests
+        run: |
+          make installcheck-world
+
+      - name: Report on installcheck-world test suites fail
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: Regressions output files of failed testsuite, and postgresql log
+          path: |
+            **/regression.diffs
+            **/regression.out
+            src/pg_stat_monitor/logfile
+          retention-days: 1
diff --git a/.github/workflows/postgresql-12-build.yml b/.github/workflows/postgresql-12-build.yml
index b4d6e19..84622f7 100644
--- a/.github/workflows/postgresql-12-build.yml
+++ b/.github/workflows/postgresql-12-build.yml
@@ -78,20 +78,6 @@ jobs:
           /usr/lib/postgresql/12/bin/pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor/
 
-      - name: Start Server installcheck-world tests (without TAP)
-        run: |
-          make installcheck-world
-      - name: Report on installcheck-world test suites fail
-        uses: actions/upload-artifact@v2
-        if: ${{ failure() }}
-        with:
-          name: Regressions output files of failed testsuite, and postgresql log
-          path: |
-            **/regression.diffs
-            **/regression.out
-            src/pg_stat_monitor/logfile
-          retention-days: 1
-
       - name: Start pg_stat_monitor_tests
         run: |
           make installcheck
@@ -106,3 +92,18 @@ jobs:
             src/pg_stat_monitor/regression.diffs
             src/pg_stat_monitor/logfile
           retention-days: 1
+
+      - name: Start Server installcheck-world tests
+        run: |
+          make installcheck-world
+ 
+      - name: Report on installcheck-world test suites fail
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: Regressions output files of failed testsuite, and postgresql log
+          path: |
+            **/regression.diffs
+            **/regression.out
+            src/pg_stat_monitor/logfile
+          retention-days: 1
\ No newline at end of file
diff --git a/.github/workflows/postgresql-13-build.yml b/.github/workflows/postgresql-13-build.yml
index 87001f5..5be730b 100644
--- a/.github/workflows/postgresql-13-build.yml
+++ b/.github/workflows/postgresql-13-build.yml
@@ -88,20 +88,6 @@ jobs:
           /usr/lib/postgresql/13/bin/pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor/
 
-      - name: Start Server installcheck-world tests
-        run: |
-          make installcheck-world
-      - name: Report on installcheck-world test suites fail
-        uses: actions/upload-artifact@v2
-        if: ${{ failure() }}
-        with:
-          name: Regressions output files of failed testsuite, and postgresql log
-          path: |
-            **/regression.diffs
-            **/regression.out
-            src/pg_stat_monitor/logfile
-          retention-days: 1
-
       - name: Start pg_stat_monitor_tests
         run: |
           make installcheck
@@ -134,3 +120,18 @@ jobs:
             !src/pg_stat_monitor/tmp_check/**/pgdata/
           if-no-files-found: warn
           retention-days: 1
+
+      - name: Start Server installcheck-world tests
+        run: |
+          make installcheck-world
+
+      - name: Report on installcheck-world test suites fail
+        uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: Regressions output files of failed testsuite, and postgresql log
+          path: |
+            **/regression.diffs
+            **/regression.out
+            src/pg_stat_monitor/logfile
+          retention-days: 1