fix that builds fail on bash errors in new blocks and bump version of…

… construct to succeed
citusdata · Jul 11, 2024 · 5c0f4e6 · 5c0f4e6
1 parent 961226d
commit 5c0f4e6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 2 deletions.
diff --git a/circleci/images/citusupgradetester/Dockerfile b/circleci/images/citusupgradetester/Dockerfile
@@ -6,6 +6,7 @@ RUN useradd -ms /bin/bash circleci
 
 RUN <<'EOF'
 # install dependencies
+set -eux
 apt-get update
 
 apt-get install -y --no-install-recommends \
@@ -54,6 +55,7 @@ ENV PG_MAJOR=$PG_MAJOR
 
 RUN <<'EOF'
 # install postgres ecosystem for pg version: $PG_VERSION
+set -eux
 
 # install key and repositories
 curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
@@ -88,6 +90,7 @@ FROM base AS builder
 
 RUN <<'EOF'
 # install dependencies
+set -eux
 apt update
 
 apt install -y \

diff --git a/circleci/images/extbuilder/Dockerfile b/circleci/images/extbuilder/Dockerfile
@@ -5,6 +5,7 @@ RUN useradd -ms /bin/bash circleci
 
 RUN <<'EOF'
 # install dependencies
+set -eux
 apt-get update
 
 apt-get install -y --no-install-recommends \
@@ -43,6 +44,7 @@ ENV PG_MAJOR=$PG_MAJOR
 
 RUN <<'EOF'
 # install postgres ecosystem for pg version: $PG_VERSION
+set -eux
 
 # install key and repositories
 curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -

diff --git a/circleci/images/exttester/Dockerfile b/circleci/images/exttester/Dockerfile
@@ -4,6 +4,8 @@ FROM buildpack-deps:bullseye AS dev-tools-builder
 
 RUN <<'EOF'
 # install dependencies
+set -eux
+
 apt-get update
 
 apt-get install -y --no-install-recommends \
@@ -49,6 +51,8 @@ WORKDIR /build/postgresql-${PG_VERSION_CLEAN}/
 COPY patches/ patches/
 RUN <<'EOF'
 # apply postgres patches
+
+set -eux
 if [ -d "patches/${PG_VERSION_CLEAN}/" ];
 then
     git apply patches/${PG_VERSION_CLEAN}/*.patch;
@@ -85,6 +89,8 @@ RUN useradd -ms /bin/bash circleci
 
 RUN <<'EOF'
 # install dependencies
+set -eux
+
 apt-get update
 
 apt-get install -y --no-install-recommends \
@@ -140,6 +146,7 @@ ENV PG_MAJOR=$PG_MAJOR
 
 RUN <<'EOF'
 # install postgres ecosystem for pg version: $PG_VERSION
+set -eux
 
 # install key and repositories
 curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -

diff --git a/circleci/images/pgupgradetester/Dockerfile b/circleci/images/pgupgradetester/Dockerfile
@@ -6,6 +6,8 @@ RUN useradd -ms /bin/bash circleci
 
 RUN <<'EOF'
 # install dependencies
+set -eux
+
 apt-get update
 
 apt-get install -y --no-install-recommends \
@@ -53,6 +55,7 @@ ENV PG_VERSIONS=$PG_VERSIONS
 SHELL ["/bin/bash", "-c"]
 RUN <<'EOF'
 # install postgres ecosystem for pg versions: $PG_VERSIONS
+set -eux
 
 # install key and repositories
 curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -

diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile
@@ -6,6 +6,8 @@ COPY ./files/etc/requirements.txt /tmp/etc/
 # openssh is needed in the image for CircleCI to pull the repo over ssh
 RUN <<'EOF'
 # install dependencies
+set -eux
+
 apk add --no-cache --virtual installdeps \
       curl \
       make \
@@ -32,7 +34,7 @@ curl -L "https://github.com/citusdata/tools/archive/v${TOOLS_VERSION}.tar.gz" |
 cd "tools-${TOOLS_VERSION}"
 make uncrustify/.install
 cd ..
-rm -rf "citus-${VERSION}" "v${TOOLS_VERSION}.tar.gz"
+rm -rf "v${TOOLS_VERSION}.tar.gz"
 
 curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz" | tar xz
 cd uncrustify-uncrustify-0.68.1/

diff --git a/circleci/images/stylechecker/files/etc/requirements.txt b/circleci/images/stylechecker/files/etc/requirements.txt
@@ -23,7 +23,7 @@ blinker==1.4
 brotli==1.0.9
 certifi==2024.2.2; python_version >= '3.6'
 cffi==1.16.0; platform_python_implementation != 'PyPy'
-construct==2.9.45
+construct==2.10.70; python_version >= '3.6'
 cryptography==42.0.3; python_version >= '3.7'
 docopt==0.6.2
 exceptiongroup==1.2.0; python_version < '3.11'