Skip to content

Commit b16399b

Browse files
shuaitian-gitsivethe
authored andcommitted
Merged PR 1555841: [OSS] fix regress sql test workflow
[OSS] fix regress sql test workflow ---- Bug fix for the SQL test workflow. This pull request fixes the regression in the SQL test workflow by updating the GitHub Actions configuration and related scripts. - Updated `.github/workflows/regress_tests.yml` to improve the build matrix, install dependencies, and run tests for multiple PostgreSQL versions and Ubuntu versions. - Modified `scripts/start_oss_server.sh` to correct the help message and default directory. - Minor cleanup in `scripts/install_setup_pg_cron.sh` to remove an unnecessary blank line.
1 parent ee06924 commit b16399b

File tree

3 files changed

+56
-18
lines changed

3 files changed

+56
-18
lines changed

.github/workflows/regress_tests.yml

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install package dependencies
4141
run: |
4242
export PG_VERSION=${{ matrix.pg_version }}
43-
export CITUS_VERSION=12.1
43+
export CITUS_VERSION=12
4444
4545
export LC_ALL=en_US.UTF-8
4646
export LANGUAGE=en_US
@@ -65,33 +65,72 @@ jobs:
6565
pkg-config \
6666
cmake \
6767
git \
68-
postgresql-${PG_VERSION} \
69-
postgresql-server-dev-${PG_VERSION} \
70-
libpq-dev \
71-
libicu-dev \
68+
locales \
69+
gcc \
70+
gdb \
71+
libipc-run-perl \
72+
unzip \
73+
apt-transport-https \
74+
bison \
75+
flex \
76+
libreadline-dev \
77+
zlib1g-dev \
7278
libkrb5-dev \
73-
postgresql-${PG_VERSION}-cron \
74-
postgresql-${PG_VERSION}-pgvector \
75-
postgresql-${PG_VERSION}-postgis-3 \
76-
postgresql-${PG_VERSION}-rum \
77-
postgresql-${PG_VERSION}-citus-${CITUS_VERSION}
79+
software-properties-common \
80+
libtool \
81+
libicu-dev \
82+
libssl-dev
7883
7984
export CLEAN_SETUP=1
8085
export INSTALL_DEPENDENCIES_ROOT=/tmp/install_setup
8186
mkdir -p /tmp/install_setup
82-
cp ./scripts/* /tmp/install_setup
87+
88+
# Install dependencies
89+
cp ./scripts/setup_versions.sh /tmp/install_setup
90+
91+
cp ./scripts/install_setup_libbson.sh /tmp/install_setup
8392
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT MAKE_PROGRAM=cmake /tmp/install_setup/install_setup_libbson.sh
84-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_pcre2.sh
85-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_intel_decimal_math_lib.sh
93+
cp ./scripts/utils.sh /tmp/install_setup
94+
cp ./scripts/install_setup_postgres.sh /tmp/install_setup/
95+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_postgres.sh -d /usr/lib/postgresql/${PG_VERSION} $POSTGRES_INSTALL_ARG -v ${PG_VERSION}
96+
cp ./scripts/install_setup_rum_oss.sh /tmp/install_setup/
97+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_rum_oss.sh
98+
cp ./scripts/install_setup_citus_core_oss.sh /tmp/install_setup/
99+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}
100+
cp ./scripts/install_citus_indent.sh /tmp/install_setup/
86101
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_citus_indent.sh
102+
cp ./scripts/install_setup_system_rows.sh /tmp/install_setup/
103+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_system_rows.sh
104+
cp ./scripts/install_setup_pg_cron.sh /tmp/install_setup/
105+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pg_cron.sh
106+
cp ./scripts/install_setup_intel_decimal_math_lib.sh /tmp/install_setup/
107+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_intel_decimal_math_lib.sh
108+
cp ./scripts/install_setup_pcre2.sh /tmp/install_setup/
109+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_pcre2.sh
110+
cp ./scripts/install_setup_pgvector.sh /tmp/install_setup/
111+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pgvector.sh
112+
113+
sudo add-apt-repository -y ppa:ubuntugis/ppa
114+
sudo apt-get update
115+
sudo apt-get install -qy \
116+
libproj-dev \
117+
libxml2-dev \
118+
libjson-c-dev \
119+
libgeos++-dev \
120+
libgeos-dev
121+
122+
cp ./scripts/install_setup_postgis.sh /tmp/install_setup/
123+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_postgis.sh
124+
125+
export PATH=$PATH:/usr/lib/postgresql/$PG_VERSION/bin
87126
88-
- name: Configure, Build and Install HelioDB
127+
- name: Configure, Build and Install DocumentDB
89128
run: |
90129
make
91130
sudo make install
92131
93132
- name: Run Tests
94-
run: |
133+
run: |
95134
export LC_ALL=en_US.UTF-8
96135
export LANGUAGE=en_US
97136
export LC_COLLATE=en_US.UTF-8

scripts/install_setup_pg_cron.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
#!/bin/bash
32

43
# fail if trying to reference a variable that is not set.

scripts/start_oss_server.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ reset=`tput sgr0`
3838

3939
if [ "$help" == "true" ]; then
4040
echo "${green}sets up and launches a postgres server with extension installed on port $coordinatorPort."
41-
echo "${green}start_oss_server -d <postgresDir> [-t <serverType>] [-c] [-s]"
41+
echo "${green}start_oss_server -d <postgresDir> [-c] [-s]"
4242
echo "${green}<postgresDir> is the data directory for your postgres instance with extension"
4343
echo "${green}[-c] - optional argument. removes all existing data if it exists"
4444
echo "${green}[-s] - optional argument. Stops all servers and exits"
45-
echo "${green}if postgresDir not specified assumed to be ~/${serverType}_test"
45+
echo "${green}if postgresDir not specified assumed to be ~/documentdb_test"
4646
exit 1;
4747
fi
4848

0 commit comments

Comments
 (0)