Skip to content

CI Refactoring: Unify code of all three CI workflows #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2023
Merged

CI Refactoring: Unify code of all three CI workflows #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:

Expand All @@ -15,6 +19,11 @@ jobs:
- uses: actions/checkout@v3
- name: "Define PostreSQL major version"
run: |
echo "The action workflow is triggered by the $BRANCH_NAME"
sudo apt install libipc-run-perl
git config --global user.email "[email protected]"
git config --global user.name "CI PgPro admin"

patch_name=$(ls aqo_*.patch|tail -1)
echo "CORE_PATCH_NAME=$patch_name" >> $GITHUB_ENV

Expand All @@ -24,38 +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 "[email protected]"
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
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
Expand All @@ -73,7 +87,7 @@ jobs:
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
93 changes: 52 additions & 41 deletions .github/workflows/installchecks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
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
- uses: actions/checkout@v3
- name: "Define PostreSQL major version"
- name: "Define PostreSQL major version and set basic environment"
run: |
echo "The action workflow is triggered by the $BRANCH_NAME"
sudo apt install libipc-run-perl
git config --global user.email "[email protected]"
git config --global user.name "CI PgPro admin"

patch_name=$(ls aqo_*.patch|tail -1)
echo "CORE_PATCH_NAME=$patch_name" >> $GITHUB_ENV

Expand All @@ -26,47 +33,51 @@ jobs:

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: |
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 "Deploying to production server on branch" $BRANCH_NAME "(PG $PG_BRANCH)"
git config --global user.email "[email protected]"
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: |
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
cd $GITHUB_WORKSPACE/../pg
cd $PG_DIR
cp -r ../aqo contrib/aqo
patch -p1 --no-backup-if-mismatch < contrib/aqo/$CORE_PATCH_NAME

- name: "Paths"
run: |
cd $GITHUB_WORKSPACE/../pg
echo "COPT=-Werror" >> $GITHUB_ENV
echo "CONFIGURE_OPTS=--prefix=`pwd`/tmp_install --enable-tap-tests --enable-cassert" >> $GITHUB_ENV
echo "$GITHUB_WORKSPACE/../pg/tmp_install/bin" >> $GITHUB_PATH
echo "$GITHUB_WORKSPACE/../pg/contrib/aqo/.github/scripts/job" >> $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

# 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 "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 $GITHUB_WORKSPACE/../pg
echo "paths: $PATH"
cd $PG_DIR
echo "COPT: $COPT"
echo "CONFIGURE_OPTS: $CONFIGURE_OPTS"
./configure $CONFIGURE_OPTS CFLAGS="-O2" > /dev/null
Expand All @@ -75,7 +86,7 @@ jobs:

- name: "Launch AQO instance"
run: |
cd $GITHUB_WORKSPACE/../pg
cd $PG_DIR

# Launch an instance with AQO extension
aqo_instance_launch.sh
Expand All @@ -86,29 +97,29 @@ jobs:
# Pass installcheck in disabled mode
- name: installcheck_disabled
run: |
cd $GITHUB_WORKSPACE/../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 $GITHUB_WORKSPACE/../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 $GITHUB_WORKSPACE/../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 $GITHUB_WORKSPACE/../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()"
Expand All @@ -117,7 +128,7 @@ jobs:
- name: installcheck_learn
continue-on-error: true
run: |
cd $GITHUB_WORKSPACE/../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()"
Expand All @@ -126,7 +137,7 @@ jobs:
- name: installcheck_intelligent
continue-on-error: true
run: |
cd $GITHUB_WORKSPACE/../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()"
Expand All @@ -135,7 +146,7 @@ jobs:
- name: installcheck_forced
continue-on-error: true
run: |
cd $GITHUB_WORKSPACE/../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()"
Expand All @@ -148,8 +159,8 @@ jobs:
with:
name: ${{ env.AQO_VERSION }}-${{ env.PG_BRANCH }}-${{ env.CORE_PATCH_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

Loading