Merge pull request #25 from rustprooflabs/bump-pgx-version

Switch pgx from develop branch to v0.2.0-beta.2

Author: rustprooflabs

Cargo.toml

@@ -20,18 +20,17 @@ pg_test = []
 
 [dependencies]
 
-pgx = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-#pgx = "0.2.0-beta.1"
-#pgx-macros = "0.2.0-beta.1"
+#pgx = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+#pgx-macros = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx = "0.2.0-beta.2"
+pgx-macros = "0.2.0-beta.2"
 
-# Won't be needed in final version (hopefully!)
-pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-#pgx-utils = "0.2.0-beta.1"
+#pgx-utils = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx-utils = "0.2.0-beta.2"
 
 [dev-dependencies]
-pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "develop" }
-#pgx-tests = "0.2.0-beta.1"
+#pgx-tests = { git = "https://github.com/zombodb/pgx", branch = "develop" }
+pgx-tests = "0.2.0-beta.2"
 
 
 [profile.dev]

build/build.sh

@@ -21,7 +21,7 @@ BASE=$(dirname `pwd`)
 VERSION=$(cat $BASE/pgdd.control | grep default_version | cut -f2 -d\')
 LOGDIR=${BASE}/target/logs
 ARTIFACTDIR=${BASE}/target/artifacts
-PGXVERSION=0.2.0-beta.1
+PGXVERSION=0.2.0-beta.2
 
 PG_VERS=("pg10" "pg11" "pg12" "pg13" "pg14")
 #PG_VERS=("pg14")

build/docker/pgdd-ubuntu-focal/Dockerfile

@@ -39,12 +39,12 @@ WORKDIR /home/${USER}
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
 ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 
-#RUN /bin/bash rustup.sh -y \
-#    && cargo install cargo-pgx --version ${PGXVERSION}
 RUN /bin/bash rustup.sh -y \
-    && cargo install --force --git "https://github.com/zombodb/pgx" \
-        --branch "develop" \
-        "cargo-pgx"
+    && cargo install cargo-pgx --version ${PGXVERSION}
+#RUN /bin/bash rustup.sh -y \
+#    && cargo install --force --git "https://github.com/zombodb/pgx" \
+#        --branch "develop" \
+#        "cargo-pgx"
 
 
 RUN mkdir -p /home/${USER}/.pgx/data-10 \

build/docker/pgdd-ubuntu-hirsute/Dockerfile

@@ -39,12 +39,12 @@ WORKDIR /home/${USER}
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
 ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
 
-#RUN /bin/bash rustup.sh -y \
-#    && cargo install cargo-pgx --version ${PGXVERSION}
 RUN /bin/bash rustup.sh -y \
-    && cargo install --force --git "https://github.com/zombodb/pgx" \
-        --branch "develop" \
-        "cargo-pgx"
+    && cargo install cargo-pgx --version ${PGXVERSION}
+#RUN /bin/bash rustup.sh -y \
+#    && cargo install --force --git "https://github.com/zombodb/pgx" \
+#        --branch "develop" \
+#        "cargo-pgx"
 
 
 RUN mkdir -p /home/${USER}/.pgx/data-10 \