CI Refactoring: Unify code of all three CI workflows

danolivo · danolivo · commit 52c9bba1495a · 2023-03-12T16:34:10.000+03:00
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -1,11 +1,15 @@
 name: 'AQO basic CI'
 
-on:
-  pull_request:
-
 env:
+  # Use it just for a report
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
+# Trigger it each timeon push or pull request. Honestly, it will be redundant
+# most of the time, but external pull-request checks don't be missed out.
+on:
+  push:
+  pull_request:
+
 jobs:
   build:
 
@@ -15,7 +19,11 @@ jobs:
     - uses: actions/checkout@v3
     - name: "Define PostreSQL major version"
       run: |
-        echo "$(ls -la)"
+        echo "The action workflow is triggered by the $BRANCH_NAME"
+        sudo apt install libipc-run-perl
+        git config --global user.email "ci@postgrespro.ru"
+        git config --global user.name "CI PgPro admin"
+
         patch_name=$(ls aqo_*.patch|tail -1)
         echo "CORE_PATCH_NAME=$patch_name" >> $GITHUB_ENV
 
@@ -25,39 +33,43 @@ jobs:
 
         branch_name="REL_${vers_number}_STABLE"
         echo "PG_BRANCH=$branch_name" >> $GITHUB_ENV
-        
-        echo "COPT=-Werror" >> $GITHUB_ENV
-        echo "CONFIGURE_OPTS=--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert" >> $GITHUB_ENV
-
     - name: "Set master branch name, if needed"
       if: env.PG_MAJOR_VERSION == ''
       run: |
         branch_name="master"
         echo "PG_BRANCH=$branch_name" >> $GITHUB_ENV
 
-    - name: "Environment (debug output)"
-      if: ${{ always() }}
+    # Create workspace directory and environment variable.
+    # It is the second step because on the first we define versions and branches
+    - name: "Initial dir"
       run: |
-        echo "Use PostgreSQL branch $PG_BRANCH (patch: $CORE_PATCH_NAME)"
-        echo "COPT: $COPT"
-        echo "CONFIGURE_OPTS: $CONFIGURE_OPTS"
-        echo "Deploying to production server on branch" $BRANCH_NAME "(PG $PG_BRANCH)"
-        git config --global user.email "ci@postgrespro.ru"
-        git config --global user.name "CI PgPro admin"
+        git clone -b $PG_BRANCH --depth=1 --single-branch https://github.com/postgres/postgres.git $GITHUB_WORKSPACE/../pg
+
+        # Invent variable with full path to PG directory just because github
+        # actions don't like relative paths ...
+        cd $GITHUB_WORKSPACE/../pg
+        echo PG_DIR=`pwd` >> $GITHUB_ENV
 
     - name: "Prepare PG directory"
       run: |
-        git clone -b $PG_BRANCH --depth=1 --single-branch https://github.com/postgres/postgres.git $GITHUB_WORKSPACE/../pg
-        cd $GITHUB_WORKSPACE/../pg
-        ls -la
+        cd $PG_DIR
         cp -r ../aqo contrib/aqo
         patch -p1 --no-backup-if-mismatch < contrib/aqo/$CORE_PATCH_NAME
+        echo "COPT=-Werror" >> $GITHUB_ENV
+        echo "CONFIGURE_OPTS=--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert" >> $GITHUB_ENV
 
-    - name: "make check"
+    # Just for debug
+    - name: "Environment (debug output)"
+      if: ${{ always() }}
       run: |
-        sudo apt install libipc-run-perl
+        echo "PG_MAJOR_VERSION: $PG_MAJOR_VERSION"
+        echo "PG_DIR: $PG_DIR"
+        echo "PG_BRANCH: $PG_BRANCH"
+        echo "CORE_PATCH_NAME: $CORE_PATCH_NAME"
 
-        cd $GITHUB_WORKSPACE/../pg
+    - name: "make check"
+      run: |
+        cd $PG_DIR
         ./configure $CONFIGURE_OPTS CFLAGS="-O2" > /dev/null
         make -j4 > /dev/null && make -j4 -C contrib > /dev/null
         env CLIENTS=50 THREADS=50 make -C contrib/aqo check
@@ -70,12 +82,12 @@ jobs:
         env CLIENTS=50 THREADS=50 make -C contrib/aqo check
 
     - name: Archive artifacts
-      if: ${{ always() }}
+      if: ${{ failure() }}
       uses: actions/upload-artifact@v3
       with:
         name: make_check_logs
         path: |
-          /home/runner/work/aqo/pg/contrib/aqo/regression.diffs
-          /home/runner/work/aqo/pg/contrib/aqo/log
-          /home/runner/work/aqo/pg/contrib/aqo/tmp_check/log
+          ${{ env.PG_DIR }}/contrib/aqo/regression.diffs
+          ${{ env.PG_DIR }}/contrib/aqo/log
+          ${{ env.PG_DIR }}/contrib/aqo/tmp_check/log
         retention-days: 7
diff --git a/.github/workflows/installchecks.yml b/.github/workflows/installchecks.yml
@@ -1,79 +1,92 @@
 name: "InstallChecks"
 
-on:
-  push:
-
 env:
+  # Use it just for a report
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
+# Trigger it each timeon push or pull request. Honestly, it will be redundant
+# most of the time, but external pull-request checks don't be missed out.
+on:
+  push:
+  pull_request:
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-
-    # Set major PostgreSQL version for all underlying steps
-    - name: "Extract Postgres major version number"
+    - uses: actions/checkout@v3
+    - name: "Define PostreSQL major version and set basic environment"
       run: |
-        PG_MAJOR_VERSION=$(echo "$BRANCH_NAME" | grep --only-matching 'stable[0-9].' | grep --only-matching '[0-9].')
+        echo "The action workflow is triggered by the $BRANCH_NAME"
+        sudo apt install libipc-run-perl
+        git config --global user.email "ci@postgrespro.ru"
+        git config --global user.name "CI PgPro admin"
+
+        patch_name=$(ls aqo_*.patch|tail -1)
+        echo "CORE_PATCH_NAME=$patch_name" >> $GITHUB_ENV
+
+        # we can get number, otherwise set up master
+        vers_number=$(echo "$patch_name"|tr -d -c 0-9)
+        echo "PG_MAJOR_VERSION=$vers_number" >> $GITHUB_ENV
 
-        # Declare PG_MAJOR_VERSION as a environment variable
-        echo "PG_MAJOR_VERSION=$PG_MAJOR_VERSION" >> $GITHUB_ENV
-        echo "CORE_BRANCH_NAME=REL_${PG_MAJOR_VERSION}_STABLE" >> $GITHUB_ENV
-        echo "AQO_PATCH_NAME=aqo_pg$PG_MAJOR_VERSION.patch" >> $GITHUB_ENV
-    - name: "Set proper names for the master case"
+        branch_name="REL_${vers_number}_STABLE"
+        echo "PG_BRANCH=$branch_name" >> $GITHUB_ENV
+    - name: "Set master branch name, if needed"
       if: env.PG_MAJOR_VERSION == ''
       run: |
-        echo "PG_MAJOR_VERSION=master" >> $GITHUB_ENV
-        echo "CORE_BRANCH_NAME=master" >> $GITHUB_ENV
-        echo "AQO_PATCH_NAME=aqo_master.patch" >> $GITHUB_ENV
+        branch_name="master"
+        echo "PG_BRANCH=$branch_name" >> $GITHUB_ENV
 
-    - name: "Preparations"
+    # Create workspace directory and environment variable.
+    # It is the second step because on the first we define versions and branches
+    - name: "Initial dir"
       run: |
-        sudo apt install libipc-run-perl libxml2-utils libxml2-dev xsltproc libxslt1-dev
+        git clone -b $PG_BRANCH --depth=1 --single-branch https://github.com/postgres/postgres.git $GITHUB_WORKSPACE/../pg
 
-        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"
-        git clone https://github.com/postgres/postgres.git pg
-        cd pg
-        git checkout $CORE_BRANCH_NAME
-        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_PATCH_NAME
-        COPT="-Werror"
-        CONFIGURE_OPTS="--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert"
-        echo "CONFIGURE_OPTS=$CONFIGURE_OPTS" >> $GITHUB_ENV
-        echo "COPT=$COPT" >> $GITHUB_ENV
-
-    - name: "Paths"
+        # Invent variable with full path to PG directory just because github
+        # actions don't like relative paths ...
+        cd $GITHUB_WORKSPACE/../pg
+        echo PG_DIR=`pwd` >> $GITHUB_ENV
+
+    - name: "Prepare PG directory"
       run: |
-        echo "$GITHUB_WORKSPACE/pg/contrib/aqo/.github/scripts/job" >> $GITHUB_PATH
-        ls -la pg/contrib/aqo/.github/scripts/job
-        echo "$GITHUB_WORKSPACE/pg/tmp_install/bin" >> $GITHUB_PATH
-        echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/pg/tmp_install/lib" >> $GITHUB_ENV
-        echo "PGDATABASE=`whoami`" >> $GITHUB_ENV
-        echo "PGHOST=localhost" >> $GITHUB_ENV
-        echo "PGDATA=PGDATA" >> $GITHUB_ENV
-        echo "PGUSER=`whoami`" >> $GITHUB_ENV
-        echo "PGPORT=5432" >> $GITHUB_ENV
-
-    - name: "Debug"
+        cd $PG_DIR
+        cp -r ../aqo contrib/aqo
+        patch -p1 --no-backup-if-mismatch < contrib/aqo/$CORE_PATCH_NAME
+        echo "COPT=-Werror" >> $GITHUB_ENV
+        echo "CONFIGURE_OPTS=--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert" >> $GITHUB_ENV
+
+        # Instance-related environment
+        echo "$PG_DIR/tmp_install/bin" >> $GITHUB_PATH
+        echo "LD_LIBRARY_PATH=$PG_DIR/tmp_install/lib" >> $GITHUB_ENV
+        echo `pwd`/contrib/aqo/.github/scripts/job >> $GITHUB_PATH
+
+    # Just for debug
+    - name: "Environment (debug output)"
+      if: ${{ always() }}
       run: |
-        echo "paths: $PATH"
-        echo "PG_MAJOR_VERSION: $PG_MAJOR_VERSION, CORE_BRANCH_NAME: $CORE_BRANCH_NAME, AQO_PATCH_NAME: $AQO_PATCH_NAME, CONFIGURE_OPTS: $CONFIGURE_OPTS"
+        echo "PG_MAJOR_VERSION: $PG_MAJOR_VERSION"
+        echo "PG_DIR: $PG_DIR"
+        echo "PG_BRANCH: $PG_BRANCH"
+        echo "CORE_PATCH_NAME: $CORE_PATCH_NAME"
+        # See these paths to understand correctness of the instance initialization
+        echo "PATHs: $PATH"
+        echo "PG Libs: $LD_LIBRARY_PATH"
 
     - name: "Compilation"
       run: |
-        cd pg
-        ./configure $CONFIGURE_OPTS CFLAGS="-O2"
+        cd $PG_DIR
+        echo "COPT: $COPT"
+        echo "CONFIGURE_OPTS: $CONFIGURE_OPTS"
+        ./configure $CONFIGURE_OPTS CFLAGS="-O2" > /dev/null
         make -j4 > /dev/null && make -j4 -C contrib > /dev/null
         make install >> make.log && make -C contrib install > /dev/null
 
     - name: "Launch AQO instance"
       run: |
-        cd pg
+        cd $PG_DIR
 
         # Launch an instance with AQO extension
         aqo_instance_launch.sh
@@ -84,29 +97,29 @@ jobs:
     # Pass installcheck in disabled mode
     - name: installcheck_disabled
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'off'"
         psql -c "SELECT pg_reload_conf()"
         make installcheck-world
 
     - name: installcheck_disabled_forced_stat
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
         make installcheck-world
 
     - name: installcheck_frozen
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.mode = 'frozen'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
         make installcheck-world
 
     - name: installcheck_controlled
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.mode = 'controlled'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
@@ -115,7 +128,7 @@ jobs:
     - name: installcheck_learn
       continue-on-error: true
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.mode = 'learn'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
@@ -124,7 +137,7 @@ jobs:
     - name: installcheck_intelligent
       continue-on-error: true
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.mode = 'intelligent'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
@@ -133,7 +146,7 @@ jobs:
     - name: installcheck_forced
       continue-on-error: true
       run: |
-        cd pg
+        cd $PG_DIR
         psql -c "ALTER SYSTEM SET aqo.mode = 'forced'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
@@ -146,8 +159,8 @@ jobs:
       with:
         name: ${{ env.AQO_VERSION }}-${{ env.CORE_BRANCH_NAME }}-${{ env.BRANCH_NAME }}-artifacts
         path: |
-          pg/src/test/regress/regression.diffs
-          pg/logfile.log
-          pg/contrib/aqo/tmp_check/log
+          ${{ env.PG_DIR }}/src/test/regress/regression.diffs
+          ${{ env.PG_DIR }}/logfile.log
+          ${{ env.PG_DIR }}/contrib/aqo/tmp_check/log
         retention-days: 2
 
diff --git a/.github/workflows/job.yml b/.github/workflows/job.yml
