Fix pg 14 and 15 build workflows

percona · Apr 2, 2024 · 8398704 · 8398704
1 parent c54a605
commit 8398704
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/postgresql-14-build.yml b/.github/workflows/postgresql-14-build.yml
@@ -83,12 +83,13 @@ jobs:
           sudo make USE_PGXS=1 install
         working-directory: src/pg_stat_monitor
 
-      - name: Load pg_stat_monitor library and Restart Server
+      - name: Configure and Restart Server
         run: |
           export PATH="/usr/lib/postgresql/14/bin:$PATH"
           pg_ctl -D /opt/pgsql/data -l logfile stop
           echo "shared_preload_libraries = 'pg_stat_monitor'" >> \
             /opt/pgsql/data/postgresql.conf
+          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
           pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor
 
@@ -128,9 +129,6 @@ jobs:
       - name: Start Server installcheck-world tests
         run: |
           export PATH="/usr/lib/postgresql/14/bin:$PATH"
-          pg_ctl -D /opt/pgsql/data -l logfile stop
-          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
-          pg_ctl -D /opt/pgsql/data -l logfile start
           make installcheck-world
 
       - name: Report on installcheck-world test suites fail

diff --git a/.github/workflows/postgresql-15-build.yml b/.github/workflows/postgresql-15-build.yml
@@ -83,12 +83,13 @@ jobs:
           sudo make USE_PGXS=1 install
         working-directory: src/pg_stat_monitor
 
-      - name: Load pg_stat_monitor library and Restart Server
+      - name: Configure and Restart Server
         run: |
           export PATH="/usr/lib/postgresql/15/bin:$PATH"
           pg_ctl -D /opt/pgsql/data -l logfile stop
           echo "shared_preload_libraries = 'pg_stat_monitor'" >> \
             /opt/pgsql/data/postgresql.conf
+          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
           pg_ctl -D /opt/pgsql/data -l logfile start
         working-directory: src/pg_stat_monitor
 
@@ -128,9 +129,6 @@ jobs:
       - name: Start Server installcheck-world tests
         run: |
           export PATH="/usr/lib/postgresql/15/bin:$PATH"
-          pg_ctl -D /opt/pgsql/data -l logfile stop
-          echo "compute_query_id = off" >> /opt/pgsql/data/postgresql.conf
-          pg_ctl -D /opt/pgsql/data -l logfile start
           make installcheck-world
 
       - name: Report on installcheck-world test suites fail