Make whitespace of CI scripts consistent

pull/209/head
Andreas Karlsson 7 months ago
parent 78507c17c0
commit 7f464a5cbe
  1. 3
      .github/workflows/pgindent.yml
  2. 2
      .github/workflows/psp-reusable.yml
  3. 3
      ci_scripts/dump-typedefs.sh
  4. 4
      ci_scripts/make-build.sh
  5. 2
      ci_scripts/make-test-tde.sh
  6. 3
      ci_scripts/make-test.sh
  7. 2
      ci_scripts/meson-build.sh
  8. 2
      ci_scripts/meson-test.sh
  9. 4
      ci_scripts/run-pgindent.sh
  10. 2
      ci_scripts/setup-keyring-servers.sh
  11. 1
      ci_scripts/ubuntu-deps.sh

@ -12,7 +12,6 @@ jobs:
name: Check name: Check
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Clone repository - name: Clone repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@ -30,5 +29,3 @@ jobs:
- name: Run pgindent - name: Run pgindent
run: ci_scripts/run-pgindent.sh --check --diff run: ci_scripts/run-pgindent.sh --check --diff

@ -20,7 +20,6 @@ jobs:
name: Build PSP name: Build PSP
runs-on: ${{ inputs.os }} runs-on: ${{ inputs.os }}
steps: steps:
- name: Clone repository - name: Clone repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@ -90,7 +89,6 @@ jobs:
needs: build needs: build
steps: steps:
- name: Download build artifacts - name: Download build artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:

@ -1,4 +1,4 @@
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/../"
if ! test -f src/backend/postgres; then if ! test -f src/backend/postgres; then
@ -28,5 +28,4 @@ objdump -W contrib/pg_tde/pg_tde.so |\
sort | uniq > tde.typedefs sort | uniq > tde.typedefs
# Combine with original typedefs # Combine with original typedefs
cat percona.typedefs tde.typedefs src/tools/pgindent/typedefs.list | sort | uniq > combined.typedefs cat percona.typedefs tde.typedefs src/tools/pgindent/typedefs.list | sort | uniq > combined.typedefs

@ -2,10 +2,9 @@
export TDE_MODE=1 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
@ -15,4 +14,3 @@ fi
./configure --enable-debug --enable-cassert --enable-tap-tests --prefix=$INSTALL_DIR ./configure --enable-debug --enable-cassert --enable-tap-tests --prefix=$INSTALL_DIR
make install-world -j make install-world -j

@ -2,7 +2,7 @@
export TDE_MODE=1 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/../"

@ -2,10 +2,9 @@
export TDE_MODE=1 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

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
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/../"

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
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/../build" cd "$SCRIPT_DIR/../build"

@ -1,5 +1,4 @@
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/../"
@ -13,7 +12,6 @@ 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
pgindent --typedefs=combined.typedefs "$@" . pgindent --typedefs=combined.typedefs "$@" .

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
cd /tmp cd /tmp

@ -7,7 +7,6 @@ sudo apt install -y libreadline6-dev systemtap-sdt-dev zlib1g-dev libssl-dev lib
bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
# Perl test dependencies # Perl test dependencies
sudo apt install -y libipc-run-perl python3-pykmip libhttp-server-simple-perl sudo apt install -y libipc-run-perl python3-pykmip libhttp-server-simple-perl
sudo /usr/bin/perl -MCPAN -e 'install IPC::Run' sudo /usr/bin/perl -MCPAN -e 'install IPC::Run'

Loading…
Cancel
Save