diff --git a/.github/docker/Dockerfile.debian-artifact-build b/.github/docker/Dockerfile.debian-artifact-build index 0d309b47..7a5c6cb2 100644 --- a/.github/docker/Dockerfile.debian-artifact-build +++ b/.github/docker/Dockerfile.debian-artifact-build @@ -84,7 +84,7 @@ ENV PATH="/var/lib/postgresql/.cargo/bin:${PATH}" # Install the version of PGRX that is dictated by Cargo.toml for this project RUN PGRX_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name=="pgrx")|.version') && \ - cargo install cargo-pgrx --force --version "$PGRX_VERSION" + cargo install cargo-pgrx --locked --force --version "$PGRX_VERSION" # Necessary to build plrustc and company RUN rustup component add llvm-tools-preview rustc-dev @@ -161,7 +161,7 @@ EOF # Package everything up based on whatever's in RELEASE_DIR, and send the resulting # .deb file to the /out directory RUN TOOLCHAIN_VER=$(</tmp/.toolchain-ver) && \ - DEB_FILENAME="plrust-trusted-${PLRUST_VER}_$TOOLCHAIN_VER-debian-pg${PG_VER}-$(dpkg --print-architecture).deb" && \ + DEB_FILENAME="plrust-trusted-${PLRUST_VER}_$TOOLCHAIN_VER-debian-bullseye-pg${PG_VER}-$(dpkg --print-architecture).deb" && \ cd ${RELEASE_DIR} && fpm \ -s dir \ -t deb \ diff --git a/.github/scripts/install_cargo_pgrx.sh b/.github/scripts/install_cargo_pgrx.sh index 1909ea06..a887e21e 100755 --- a/.github/scripts/install_cargo_pgrx.sh +++ b/.github/scripts/install_cargo_pgrx.sh @@ -18,7 +18,7 @@ function install_cargo_pgrx() { if TARGET_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name=="pgrx")|.version'); then echo "Installing/upgrading cargo-pgrx to version $TARGET_VERSION" - cargo install cargo-pgrx --force --version "$TARGET_VERSION" + cargo install cargo-pgrx --locked --force --version "$TARGET_VERSION" else echo "Could not determine cargo-pgrx version to install." exit 1 diff --git a/Dockerfile.try b/Dockerfile.try index d833a81a..3d13ce5b 100644 --- a/Dockerfile.try +++ b/Dockerfile.try @@ -65,7 +65,7 @@ ENV PATH="/var/lib/postgresql/.cargo/bin:${PATH}" # Build/install/remove all that is necessary in one step as to keep the resulting layer as small as possible. RUN PGRX_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name=="pgrx")|.version') && \ - cargo install cargo-pgrx --force --version "$PGRX_VERSION" && \ + cargo install cargo-pgrx --locked --force --version "$PGRX_VERSION" && \ rustup component add llvm-tools-preview rustc-dev && \ cd /src/plrustc && ./build.sh && cp ../build/bin/plrustc ~/.cargo/bin && \ cargo pgrx init --pg15 $(which pg_config) && \