sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-30 00:02:11 -04:00
Code Issues Projects Releases Wiki Activity

Harmonize the different Github Actions entry points

Browse Source 
The meson and the make scripts had diverged a lot, so this commit fixes
that plus some other inconsistencies.
This commit is contained in:
Andreas Karlsson 2025-04-25 23:15:40 +02:00 committed by Andreas Karlsson
parent 712dcf5976
commit e979ab71c2
7 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci_scripts/configure-global-tde.sh
View File

@ -7,6 +7,7 @@ source $SCRIPT_DIR/env.sh
cd "$SCRIPT_DIR/.." cd "$SCRIPT_DIR/.."
source "$SCRIPT_DIR/env.sh"
export PATH=$INSTALL_DIR/bin:$PATH export PATH=$INSTALL_DIR/bin:$PATH
export DATA_DIR=$INSTALL_DIR/data export DATA_DIR=$INSTALL_DIR/data
export PGDATA="${1:-$DATA_DIR}" export PGDATA="${1:-$DATA_DIR}"

4
ci_scripts/make-build.sh
View File

@ -13,7 +13,7 @@ done
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
INSTALL_DIR="$SCRIPT_DIR/../../pginst" INSTALL_DIR="$SCRIPT_DIR/../../pginst"
source $SCRIPT_DIR/env.sh source "$SCRIPT_DIR/env.sh"
cd "$SCRIPT_DIR/.." cd "$SCRIPT_DIR/.."
@ -22,5 +22,5 @@ if [ "$1" = "debugoptimized" ]; then
export CXXFLAGS="-O2" export CXXFLAGS="-O2"
fi fi
./configure --enable-debug --enable-cassert --enable-tap-tests --prefix=$INSTALL_DIR $ENABLE_COVERAGE ./configure --prefix="$INSTALL_DIR" --enable-debug --enable-cassert --enable-tap-tests $ENABLE_COVERAGE
make install-world -j make install-world -j

3
ci_scripts/make-test-global-tde.sh
View File

@ -13,7 +13,6 @@ do
done done
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
source $SCRIPT_DIR/env.sh source "$SCRIPT_DIR/configure-global-tde.sh"
source $SCRIPT_DIR/configure-global-tde.sh
EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql" make -s installcheck-world $ADD_FLAGS EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql" make -s installcheck-world $ADD_FLAGS

5
ci_scripts/make-test.sh
View File

@ -12,9 +12,8 @@ do
esac esac
done done
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
INSTALL_DIR="$SCRIPT_DIR/../../pginst" source "$SCRIPT_DIR/env.sh"
source $SCRIPT_DIR/env.sh
if [ "$TDE_ONLY" -eq 1 ]; if [ "$TDE_ONLY" -eq 1 ];
then then

15
ci_scripts/meson-build.sh
View File

@ -1,8 +1,21 @@
#!/bin/bash #!/bin/bash
ENABLE_COVERAGE=
for arg in "$@"
do
case "$arg" in
--enable-coverage)
ENABLE_COVERAGE="-Db_coverage=true"
shift;;
esac
done
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
INSTALL_DIR="$SCRIPT_DIR/../../pginst"
source "$SCRIPT_DIR/env.sh"
cd "$SCRIPT_DIR/.." cd "$SCRIPT_DIR/.."
meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled meson setup build --prefix "$INSTALL_DIR" --buildtype="$1" -Dcassert=true -Dtap_tests=enabled $ENABLE_COVERAGE
cd build && ninja && ninja install cd build && ninja && ninja install

0
ci_scripts/meson-test-tde.sh → ci_scripts/meson-test-global-tde.sh
View File

20
ci_scripts/meson-test.sh
View File

@ -1,7 +1,25 @@
#!/bin/bash #!/bin/bash
set -e
TDE_ONLY=0
for arg in "$@"
do
case "$arg" in
--tde-only)
TDE_ONLY=1
shift;;
esac
done
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
source "$SCRIPT_DIR/env.sh"
cd "$SCRIPT_DIR/../build" cd "$SCRIPT_DIR/../build"
meson test if [ "$TDE_ONLY" -eq 1 ];
then
meson test --suite setup --suite pg_tde
else
meson test
fi