mirror of
https://github.com/postgres/postgres.git
synced 2025-05-29 00:03:09 -04:00
Harmonize the different Github Actions entry points
The meson and the make scripts had diverged a lot, so this commit fixes that plus some other inconsistencies.
This commit is contained in:
parent
712dcf5976
commit
e979ab71c2
@ -7,6 +7,7 @@ source $SCRIPT_DIR/env.sh
|
||||
|
||||
cd "$SCRIPT_DIR/.."
|
||||
|
||||
source "$SCRIPT_DIR/env.sh"
|
||||
export PATH=$INSTALL_DIR/bin:$PATH
|
||||
export DATA_DIR=$INSTALL_DIR/data
|
||||
export PGDATA="${1:-$DATA_DIR}"
|
||||
|
@ -13,7 +13,7 @@ done
|
||||
|
||||
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"
|
||||
|
||||
cd "$SCRIPT_DIR/.."
|
||||
|
||||
@ -22,5 +22,5 @@ if [ "$1" = "debugoptimized" ]; then
|
||||
export CXXFLAGS="-O2"
|
||||
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
|
||||
|
@ -13,7 +13,6 @@ do
|
||||
done
|
||||
|
||||
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
|
||||
|
@ -13,8 +13,7 @@ do
|
||||
done
|
||||
|
||||
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 ];
|
||||
then
|
||||
|
@ -1,8 +1,21 @@
|
||||
#!/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)"
|
||||
INSTALL_DIR="$SCRIPT_DIR/../../pginst"
|
||||
source "$SCRIPT_DIR/env.sh"
|
||||
|
||||
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
|
||||
|
@ -1,7 +1,25 @@
|
||||
#!/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)"
|
||||
source "$SCRIPT_DIR/env.sh"
|
||||
|
||||
cd "$SCRIPT_DIR/../build"
|
||||
|
||||
if [ "$TDE_ONLY" -eq 1 ];
|
||||
then
|
||||
meson test --suite setup --suite pg_tde
|
||||
else
|
||||
meson test
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user