From 6b148b3699e24b295690e14fb338702fca30da0a Mon Sep 17 00:00:00 2001
From: Chad <chaogu@cmail.carleton.ca>
Date: Tue, 18 Jun 2024 17:00:04 -0400
Subject: [PATCH] u3

---
 .github/workflows/ci.yml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46eb7a1..a357508 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,9 @@ jobs:
       run: sudo apt-get update -y
     - name: Install dependencies
       run: sudo apt-get install -y --no-install-recommends git gcc cmake make wget build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt1-dev libssl-dev libxml2-utils xsltproc ccache pkg-config check
-    - name: Define install_postgresql() function
+    - name: Run all steps
       run: |
+        set -e
         install_postgresql() {
           version=${1:-13}
           git_repo="https://github.com/postgres/postgres.git"
@@ -36,23 +37,21 @@ jobs:
           export PATH=/usr/local/pgsql/bin:$PATH
           export LD_LIBRARY_PATH=/usr/local/pgsql/lib
         }
-    - name: Define config_postgresql() function
-      run: |
+
         config_postgresql(){
           version=${1:-13}
           sudo -u postgres sed -i 's/^#\s*password_encryption\s*=\s*\(md5\|scram-sha-256\)/password_encryption = scram-sha-256/' /tmp/pgsql-${version}/postgresql.conf
           sudo -u postgres sed -i '/^host/d' /tmp/pgsql-${version}/pg_hba.conf
           sudo -u postgres bash -c "cat <<EOF >> /tmp/pgsql-${version}/pg_hba.conf
-        host    postgres         repl            127.0.0.1/32            scram-sha-256
-        host    postgres         repl            ::1/128                 scram-sha-256
-        host    replication      repl            127.0.0.1/32            scram-sha-256
-        host    replication      repl            ::1/128                 scram-sha-256
-        EOF"
+host    postgres         repl            127.0.0.1/32            scram-sha-256
+host    postgres         repl            ::1/128                 scram-sha-256
+host    replication      repl            127.0.0.1/32            scram-sha-256
+host    replication      repl            ::1/128                 scram-sha-256
+EOF"
           sudo -u postgres /usr/local/pgsql/bin/pg_ctl -D /tmp/pgsql-${version} -l /tmp/logfile restart
           sudo -u postgres /usr/local/pgsql/bin/psql -U postgres -c "CREATE ROLE repl WITH LOGIN REPLICATION PASSWORD 'secretpassword';"
         }
-    - name: Define install_pgmoneta_ext() function
-      run: |
+
         install_pgmoneta_ext() {
           cd /home/runner/work/pgmoneta_ext/pgmoneta_ext/
           mkdir build
@@ -61,14 +60,12 @@ jobs:
           make
           sudo make install
         }
-    - name: Define create_pgmoneta_ext() function
-      run: |
+
         create_pgmoneta_ext(){
           sudo -u postgres /usr/local/pgsql/bin/psql -U postgres -c "DROP EXTENSION IF EXISTS pgmoneta_ext;"
           sudo -u postgres /usr/local/pgsql/bin/psql -U postgres -c "CREATE EXTENSION pgmoneta_ext;"
         }
-    - name: Define test_pgmoneta_ext() function
-      run: |
+
         test_pgmoneta_ext(){
           cd /home/runner/work/pgmoneta_ext/pgmoneta_ext/test
           mkdir build
@@ -81,8 +78,7 @@ jobs:
           sudo -u postgres /usr/local/pgsql/bin/psql -U postgres -c "DROP ROLE repl;"
           sudo -u postgres /usr/local/pgsql/bin/pg_ctl -D /tmp/pgsql-${version} -l /tmp/logfile stop
         }
-    - name: Define cleanup() function
-      run: |
+
         cleanup(){
           sudo rm -rf /usr/local/pgsql
           sudo rm -rf /usr/local/bin/psql
@@ -95,8 +91,7 @@ jobs:
           sudo rm -rf /tmp/postgres
           sudo hash -r
         }
-    - name: Run all functions
-      run: |
+
         VERSION=13
         while [ $VERSION -lt 17 ]; do
           cleanup