Skip to content

Commit

Permalink
Fixe warning: /tmp/pg_jsonschema/.cargo/config is deprecated in fav…
Browse files Browse the repository at this point in the history
…or of `config.toml`
  • Loading branch information
ALVSoft committed Aug 26, 2024
1 parent 19fedd6 commit 78a3dda
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ARG DEB_PG_SUPPORTED_VERSIONS="$PGOLDVERSIONS $PGVERSION"
ARG GO_VERSION=1.23.0
ARG CARGO_VERSION=0.12.1

ENV HOME="/home/postgres"
#ENV HOME="/home/postgres"
ENV PATH="${PATH}:/usr/local/go/bin:${HOME}.cargo/bin"

# RUN chown -R postgres:postgres "$HOME"
Expand Down
4 changes: 3 additions & 1 deletion docker/build_scripts/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable
(
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
#. "$HOME/.cargo/env"
cargo install -j "$(nproc)" --locked cargo-pgrx --version "$CARGO_VERSION"
rustup component add llvm-tools-preview
)
Expand Down Expand Up @@ -224,6 +224,7 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do
# use subshell to avoid having to cd back (SC2103)
(
cd /tmp/pg_jsonschema
mv -f .cargo/config .cargo/config.toml
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
cargo pgrx init "--pg$version=$PG_CONFIG"
Expand All @@ -241,6 +242,7 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do
# use subshell to avoid having to cd back (SC2103)
(
cd /tmp/pg_graphql
mv -f .cargo/config .cargo/config.toml
# shellcheck disable=SC1091
. "$HOME/.cargo/env"
cargo pgrx init "--pg$version=$PG_CONFIG"
Expand Down

0 comments on commit 78a3dda

Please sign in to comment.