From f2a4dfe2351ff12c6358a54bc0e6ab42a7910445 Mon Sep 17 00:00:00 2001 From: Ryan Walker Date: Wed, 25 May 2022 14:28:10 -0400 Subject: [PATCH] remove PATH hack was needed for #408 to pass CI --- docker/ci/Dockerfile | 3 +-- tools/build | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 346985f31..9046a88bf 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -12,8 +12,7 @@ USER postgres RUN cargo install cargo-pgx --version '=0.2.4' --root /home/postgres/pgx/0.2 \ && cargo install cargo-pgx --version '=0.4.5' --root /home/postgres/pgx/0.4 -# TODO After we upgrade to 0.4 change this to 0.4 and remove the hack in tools/build . -ENV PATH "/home/postgres/pgx/0.2/bin/:${PATH}" +ENV PATH "/home/postgres/pgx/0.4/bin/:${PATH}" RUN set -ex \ && cargo pgx init --pg12 download --pg13 download --pg14 download \ diff --git a/tools/build b/tools/build index 6075ca266..20df69375 100755 --- a/tools/build +++ b/tools/build @@ -2,9 +2,6 @@ set -ex -# TODO After we upgrade to 0.4 make this change in docker/ci/Dockerfile and then remove this line. -export PATH=/home/postgres/pgx/0.4/bin:$PATH - print() { printf '%s\n' "$*" }