Skip to content
Open
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
11 changes: 6 additions & 5 deletions .github/workflows/package-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up prerequisites and environment
run: |
sudo apt-get update -y -qq --fix-missing

echo ""
echo "----- Install sccache -----"
mkdir -p $HOME/.local/bin
Expand All @@ -35,20 +35,21 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
mkdir -p /home/runner/.cache/sccache
echo ""

echo "----- Set up dynamic variables -----"
cat $GITHUB_ENV
echo ""

echo "----- Remove old postgres -----"
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
echo ""

echo "----- Install system dependencies -----"
sudo apt-get install -y \
build-essential \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
libkrb5-dev \
libssl-dev \
libz-dev \
make \
Expand All @@ -65,7 +66,7 @@ jobs:
echo 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc' >> $GITHUB_ENV
# TODO: not all of these should be needed, but for now it's likely fine.
echo 'BINDGEN_EXTRA_CLANG_ARGS_aarch64-unknown-linux-gnu=-target aarch64-unknown-linux-gnu -isystem /usr/aarch64-linux-gnu/include/ -ccc-gcc-name aarch64-linux-gnu-gcc' >> $GITHUB_ENV

echo "----- Print env -----"
env
echo ""
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/runas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up prerequisites and environment
run: |
sudo apt-get update -y -qq --fix-missing

echo ""
echo "----- Install sccache -----"
mkdir -p $HOME/.local/bin
Expand All @@ -35,20 +35,21 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
mkdir -p /home/runner/.cache/sccache
echo ""

echo "----- Set up dynamic variables -----"
cat $GITHUB_ENV
echo ""

echo "----- Remove old postgres -----"
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
echo ""

echo "----- Install system dependencies -----"
sudo apt-get install -y \
build-essential \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
libkrb5-dev \
libssl-dev \
libz-dev \
make \
Expand All @@ -65,7 +66,7 @@ jobs:
echo 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc' >> $GITHUB_ENV
# TODO: not all of these should be needed, but for now it's likely fine.
echo 'BINDGEN_EXTRA_CLANG_ARGS_aarch64-unknown-linux-gnu=-target aarch64-unknown-linux-gnu -isystem /usr/aarch64-linux-gnu/include/ -ccc-gcc-name aarch64-linux-gnu-gcc' >> $GITHUB_ENV

echo "----- Print env -----"
env
echo ""
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
- name: Set up prerequisites and environment
run: |
sudo apt-get update -y -qq --fix-missing

echo ""

echo "----- Install / Set up sccache -----"
mkdir -p $HOME/.local/bin
curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-x86_64-unknown-linux-musl.tar.gz | tar xz
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- name: Set up prerequisites and environment
run: |
sudo apt-get update -y -qq --fix-missing

echo ""
echo "----- Install sccache -----"
mkdir -p $HOME/.local/bin
Expand All @@ -133,20 +133,21 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
mkdir -p /home/runner/.cache/sccache
echo ""

echo "----- Set up dynamic variables -----"
cat $GITHUB_ENV
echo ""

echo "----- Remove old postgres -----"
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
echo ""

echo "----- Install system dependencies -----"
sudo apt-get install -y \
build-essential \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
libkrb5-dev \
libssl-dev \
libz-dev \
make \
Expand All @@ -163,7 +164,7 @@ jobs:
echo 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc' >> $GITHUB_ENV
# TODO: not all of these should be needed, but for now it's likely fine.
echo 'BINDGEN_EXTRA_CLANG_ARGS_aarch64-unknown-linux-gnu=-target aarch64-unknown-linux-gnu -isystem /usr/aarch64-linux-gnu/include/ -ccc-gcc-name aarch64-linux-gnu-gcc' >> $GITHUB_ENV

echo "----- Print env -----"
env
echo ""
Expand Down Expand Up @@ -321,9 +322,9 @@ jobs:
- name: Set up prerequisites and environment
run: |
sudo apt-get update -y -qq --fix-missing

echo ""

echo "----- Install / Set up sccache -----"
mkdir -p $HOME/.local/bin
curl -L https://github.com/mozilla/sccache/releases/download/v0.2.15/sccache-v0.2.15-x86_64-unknown-linux-musl.tar.gz | tar xz
Expand All @@ -335,14 +336,14 @@ jobs:

cat $GITHUB_ENV
echo ""

cat $GITHUB_ENV
echo ""

echo "----- Remove old postgres -----"
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
echo ""

echo "----- Install system dependencies -----"
sudo apt-get install -y \
build-essential \
Expand Down Expand Up @@ -455,7 +456,7 @@ jobs:
- name: brew install postgresql
run: |
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ${FORMULA}

echo "$(brew --prefix ${FORMULA})/bin" >> $GITHUB_PATH
env:
FORMULA: postgresql@${{ matrix.postgresql }}
Expand All @@ -465,19 +466,19 @@ jobs:
- name: Set up prerequisites and environment
run: |
echo ""

echo "----- Install sccache -----"
curl -L https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-x86_64-apple-darwin.tar.gz | tar xz
mv -f sccache-v0.5.4-x86_64-apple-darwin/sccache /usr/local/bin
chmod +x /usr/local/bin/sccache
mkdir -p $SCCACHE_DIR
sccache --version

echo "----- Getting pre-installed Postgres major version -----"
PG_VER=$(pg_config --version | awk '{split($2,a,"."); print a[1]}')
echo "PG_VER=$PG_VER" >> $GITHUB_ENV
cat $GITHUB_ENV

echo "----- Set up Postgres permissions -----"
sudo chmod a+rwx `$(which pg_config) --pkglibdir` `$(which pg_config) --sharedir`/extension
# ls -lath `$(which pg_config) --pkglibdir` `$(which pg_config) --sharedir`/extension
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ It is currently expected to work on other "Unix" OS with possible small changes,
- Linux and MacOS: GCC or Clang if `cshim` feature is enabled, and no need if the `cshim` feature is disabled
- Windows: MSVC or Clang
- [PostgreSQL's build dependencies](https://wiki.postgresql.org/wiki/Compile_and_Install_from_source_code) ‡
- Debian-likes: `sudo apt-get install build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache pkg-config`
- RHEL-likes: `sudo yum install -y bison-devel readline-devel zlib-devel openssl-devel wget ccache && sudo yum groupinstall -y 'Development Tools'`
- Debian-likes: `sudo apt-get install build-essential libreadline-dev zlib1g-dev flex bison libkrb5-dev libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache pkg-config`
- RHEL-likes: `sudo yum install -y bison-devel readline-devel zlib-devel openssl-devel wget ccache krb5-devel && sudo yum groupinstall -y 'Development Tools'`

† PGRX has no MSRV policy, thus may require the latest stable version of Rust, available via Rustup

Expand Down
1 change: 1 addition & 0 deletions pgrx-pg-sys/include/pg13.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down
3 changes: 2 additions & 1 deletion pgrx-pg-sys/include/pg14.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down Expand Up @@ -173,7 +174,7 @@
#include "tsearch/ts_cache.h"
#include "tsearch/ts_public.h"
#include "tsearch/ts_utils.h"
#include "utils/acl.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
Expand Down
3 changes: 2 additions & 1 deletion pgrx-pg-sys/include/pg15.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down Expand Up @@ -174,7 +175,7 @@
#include "tsearch/ts_cache.h"
#include "tsearch/ts_public.h"
#include "tsearch/ts_utils.h"
#include "utils/acl.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
Expand Down
3 changes: 2 additions & 1 deletion pgrx-pg-sys/include/pg16.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down Expand Up @@ -176,7 +177,7 @@
#include "tsearch/ts_cache.h"
#include "tsearch/ts_public.h"
#include "tsearch/ts_utils.h"
#include "utils/acl.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/date.h"
#include "utils/datetime.h"
Expand Down
1 change: 1 addition & 0 deletions pgrx-pg-sys/include/pg17.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down
1 change: 1 addition & 0 deletions pgrx-pg-sys/include/pg18.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
#include "foreign/foreign.h"
#include "jit/jit.h"
#include "lib/stringinfo.h"
#include "libpq/auth.h"
#include "libpq/pqformat.h"
#include "mb/pg_wchar.h"
#include "nodes/execnodes.h"
Expand Down
Loading