Update github actions file (c-cpp.yml):

danolivo · danolivo · commit 78a12080ee6f · 2022-10-21T08:52:10.000+05:00
1. Enable TAP-tests
2. Add some useful options for configure and build stages.
3. Parameterize github CI, just to reduce code duplication.

Authors: m.polyakova (mostly), and a.lepikhov.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ stable15 ]
 
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
 jobs:
   build:
 
@@ -14,14 +17,27 @@ jobs:
     steps:
     - name: pg
       run: |
-        echo "Deploying to production server on branch $GITHUB_REF"
+        sudo apt install libipc-run-perl
+
+        echo "Deploying to production server on branch" $BRANCH_NAME
         git config --global user.email "ci@postgrespro.ru"
         git config --global user.name "CI PgPro admin"
+        export COPT=-Werror
+        export CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
         git clone https://github.com/postgres/postgres.git pg
         cd pg
+
         git checkout REL_15_STABLE
-        ./configure --prefix=`pwd`/tmp_install
-        git subtree add --prefix=contrib/aqo https://github.com/postgrespro/aqo.git $GITHUB_REF
+        git clone https://github.com/postgrespro/aqo.git contrib/aqo
+        git -C contrib/aqo checkout $BRANCH_NAME
         patch -p1 --no-backup-if-mismatch < contrib/aqo/aqo_pg15.patch
+        ./configure $CONFIGURE_OPTS CFLAGS="-O3"
+        make -j4 > /dev/null && make -j4 -C contrib > /dev/null
+        env CLIENTS=50 THREADS=50 make -C contrib/aqo check
+
+        echo "Use AQO with debug code included"
+        git clean -fdx
+        git -C contrib/aqo clean -fdx
+        ./configure $CONFIGURE_OPTS CFLAGS="-DAQO_DEBUG_PRINT -O0"
         make -j4 > /dev/null && make -j4 -C contrib > /dev/null
         env CLIENTS=50 THREADS=50 make -C contrib/aqo check
diff --git a/t/001_pgbench.pl b/t/001_pgbench.pl
@@ -336,7 +336,7 @@
 	"SELECT sum(executions_with_aqo) FROM test.aqo_query_stat");
 
 # 25 trans * 10 clients * 4 query classes = 1000 + unique SELECT to pgbench_branches
-is($res, 1001, 'Each query should be logged in LEARN mode');
+is($res, $CLIENTS*100+1, 'Each query should be logged in LEARN mode');
 $res = $node->safe_psql('postgres',
 	"SELECT sum(executions_without_aqo) FROM test.aqo_query_stat");
 is($res, 0, 'AQO has learned on the queries - 2');
