Remove pointless trailing slashes in paths in CI scripts

pull/209/head
Andreas Karlsson 7 months ago
parent 2a3bd28fdd
commit d60abd33ea
  1. 2
      ci_scripts/make-build.sh
  2. 2
      ci_scripts/make-test-tde.sh
  3. 2
      ci_scripts/make-test.sh
  4. 2
      ci_scripts/meson-build.sh
  5. 2
      ci_scripts/run-pgindent.sh

@ -5,7 +5,7 @@ export TDE_MODE=1
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"
cd "$SCRIPT_DIR/../" cd "$SCRIPT_DIR/.."
if [ "$1" = "debugoptimized" ]; then if [ "$1" = "debugoptimized" ]; then
export CFLAGS="-O2" export CFLAGS="-O2"

@ -5,7 +5,7 @@ export TDE_MODE=1
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"
cd "$SCRIPT_DIR/../" cd "$SCRIPT_DIR/.."
export PATH=$INSTALL_DIR/bin:$PATH export PATH=$INSTALL_DIR/bin:$PATH
export PGDATA=$INSTALL_DIR/data export PGDATA=$INSTALL_DIR/data

@ -5,6 +5,6 @@ export TDE_MODE=1
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"
cd "$SCRIPT_DIR/../" cd "$SCRIPT_DIR/.."
make check-world make check-world

@ -2,7 +2,7 @@
SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
cd "$SCRIPT_DIR/../" cd "$SCRIPT_DIR/.."
meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled
cd build && ninja && ninja install cd build && ninja && ninja install

@ -12,7 +12,7 @@ fi
cd src/tools/pg_bsd_indent cd src/tools/pg_bsd_indent
make install make install
cd "$SCRIPT_DIR/../" cd "$SCRIPT_DIR/.."
export PATH=$SCRIPT_DIR/../src/tools/pgindent/:$INSTALL_DIR/bin/:$PATH export PATH=$SCRIPT_DIR/../src/tools/pgindent/:$INSTALL_DIR/bin/:$PATH

Loading…
Cancel
Save