Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update version to 1.2.8 #404

Merged
merged 6 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/docker/Dockerfile.debian-artifact-build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/install_cargo_pgrx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
git update-ref -d refs/heads/gh-pages
rm -rf *
mv ../book/* .
echo 'plrust.io' > CNAME
git add .
git commit -m "Deploy $GITHUB_SHA to gh-pages"
git push --force --set-upstream origin gh-pages
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile.try
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down
2 changes: 1 addition & 1 deletion plrust-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "plrust-tests"
version = "1.2.7"
version = "1.2.8"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion plrust-trusted-pgrx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "plrust-trusted-pgrx"
version = "1.2.7"
version = "1.2.8"
authors = ["TCDI <opensource@tcdi.com>"]
edition = "2021"
license = "PostgreSQL"
Expand Down
2 changes: 1 addition & 1 deletion plrust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "plrust"
version = "1.2.7"
version = "1.2.8"
authors = ["TCDI <opensource@tcdi.com>"]
edition = "2021"
license = "PostgreSQL Open Source License"
Expand Down
Loading
Loading