From d60abd33eaabf67e8b282c61302f706ccc6f0866 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Tue, 4 Feb 2025 15:36:14 +0100 Subject: [PATCH] Remove pointless trailing slashes in paths in CI scripts --- ci_scripts/make-build.sh | 2 +- ci_scripts/make-test-tde.sh | 2 +- ci_scripts/make-test.sh | 2 +- ci_scripts/meson-build.sh | 2 +- ci_scripts/run-pgindent.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci_scripts/make-build.sh b/ci_scripts/make-build.sh index 26655c76fc1..48e015f85af 100755 --- a/ci_scripts/make-build.sh +++ b/ci_scripts/make-build.sh @@ -5,7 +5,7 @@ export TDE_MODE=1 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" INSTALL_DIR="$SCRIPT_DIR/../../pginst" -cd "$SCRIPT_DIR/../" +cd "$SCRIPT_DIR/.." if [ "$1" = "debugoptimized" ]; then export CFLAGS="-O2" diff --git a/ci_scripts/make-test-tde.sh b/ci_scripts/make-test-tde.sh index 1453ea09842..6e7892642ab 100755 --- a/ci_scripts/make-test-tde.sh +++ b/ci_scripts/make-test-tde.sh @@ -5,7 +5,7 @@ export TDE_MODE=1 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" INSTALL_DIR="$SCRIPT_DIR/../../pginst" -cd "$SCRIPT_DIR/../" +cd "$SCRIPT_DIR/.." export PATH=$INSTALL_DIR/bin:$PATH export PGDATA=$INSTALL_DIR/data diff --git a/ci_scripts/make-test.sh b/ci_scripts/make-test.sh index 8c892d97f65..09ebdd313a7 100755 --- a/ci_scripts/make-test.sh +++ b/ci_scripts/make-test.sh @@ -5,6 +5,6 @@ export TDE_MODE=1 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)" INSTALL_DIR="$SCRIPT_DIR/../../pginst" -cd "$SCRIPT_DIR/../" +cd "$SCRIPT_DIR/.." make check-world diff --git a/ci_scripts/meson-build.sh b/ci_scripts/meson-build.sh index c61538755de..c94b12421ab 100755 --- a/ci_scripts/meson-build.sh +++ b/ci_scripts/meson-build.sh @@ -2,7 +2,7 @@ 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 cd build && ninja && ninja install diff --git a/ci_scripts/run-pgindent.sh b/ci_scripts/run-pgindent.sh index 2b8f391825a..13964ffe35c 100755 --- a/ci_scripts/run-pgindent.sh +++ b/ci_scripts/run-pgindent.sh @@ -12,7 +12,7 @@ fi cd src/tools/pg_bsd_indent make install -cd "$SCRIPT_DIR/../" +cd "$SCRIPT_DIR/.." export PATH=$SCRIPT_DIR/../src/tools/pgindent/:$INSTALL_DIR/bin/:$PATH