Skip to content

Commit 3ea2bbe

Browse files
committed
skip build step if citus_version is empty
1 parent cf83cdd commit 3ea2bbe

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

circleci/images/exttester/Dockerfile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ ENV CITUS_VERSIONS=$CITUS_VERSION
189189

190190
WORKDIR /build-citus/
191191
COPY citusupgradetester/files/sbin/build-citus .
192-
RUN ./build-citus
192+
RUN if [ -n "${CITUS_VERSION}" ]; then ./build-citus; else echo "Skipping citus build - CITUS_VERSION not set"; fi
193193

194194

195195
FROM setup-environment
@@ -205,10 +205,17 @@ ENV PG_VERSION=$PG_VERSION
205205
COPY --from=dev-tools-collection /collect/ /
206206

207207
# copy citus so files from the build-citus stage
208-
WORKDIR /opt/citus-versions/${CITUS_VERSION}
209-
COPY --from=build-citus /build-citus/so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar .
210-
RUN tar xvf so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar
211-
# cleanup build artifacts
212-
RUN rm so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar
208+
COPY --from=build-citus /build-citus/ /tmp/build-citus/
209+
210+
# Extract conditionally in shell
211+
RUN <<'EOF'
212+
set -eux
213+
if [ -n "${CITUS_VERSION}" ] && [ -f "/tmp/build-citus/so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar" ]; then
214+
mkdir -p /opt/citus-versions/${CITUS_VERSION}
215+
cd /opt/citus-versions/${CITUS_VERSION}
216+
tar xvf /tmp/build-citus/so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar
217+
fi
218+
EOF
219+
RUN rm -rf /tmp/build-citus/
213220

214221
WORKDIR /home/circleci

0 commit comments

Comments
 (0)