Skip to content
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: 1 addition & 3 deletions .github/docker/Dockerfile.debian-artifact-build
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
apt-get update -y -qq --fix-missing && \
apt-get install -y --no-install-recommends \
build-essential \
clang \
clang-11 \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
git \
jq \
libssl-dev \
llvm-11 \
make \
postgresql-${PG_VER} \
postgresql-server-dev-${PG_VER} \
Expand Down
32 changes: 10 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
version: ["pg13", "pg14", "pg15", "pg16"]
version: ["pg13", "pg14", "pg15"]
target: ["host", "postgrestd"]
fail-fast: false

Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
echo ""

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

echo "----- Set up PostgreSQL Apt repository -----"
Expand All @@ -256,18 +256,20 @@ jobs:
echo "----- Install system dependencies and PostgreSQL version $PG_VER -----"
sudo apt-get install -y \
build-essential \
clang \
clang-11 \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
libssl-dev \
libz-dev \
llvm-11 \
make \
pkg-config \
strace \
zlib1g-dev
echo ""

echo "----- Installed Packages -----"
sudo apt list --installed
echo ""

echo "----- Print env -----"
env
echo ""
Expand All @@ -277,7 +279,6 @@ jobs:
echo ""

- name: Install release version of PostgreSQL
if: matrix.version != 'pg16'
run: |
echo "----- Set up PostgreSQL Apt repository -----"
sudo apt-get install -y wget gnupg
Expand All @@ -289,22 +290,9 @@ jobs:
sudo apt-get install -y \
postgresql-"$PG_VER" \
postgresql-server-dev-"$PG_VER"

- name: Install development version of PostgreSQL
if: matrix.version == 'pg16'
run: |
echo "----- Set up PostgreSQL Apt repository -----"
sudo apt-get install -y wget gnupg
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7FCC7D46ACCC4CF8
sudo add-apt-repository "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -s -c)-pgdg-snapshot main 16"
sudo add-apt-repository "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -s -c)-pgdg main 16"
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
sudo apt-get update -y -qq --fix-missing
echo ""

sudo apt-get install -y \
postgresql-"$PG_VER" \
postgresql-server-dev-"$PG_VER"

echo "---- pg_config info ----"
/usr/lib/postgresql/"$PG_VER"/bin/pg_config

- name: Set up Postgres permissions
run: sudo chmod a+rwx "$(/usr/lib/postgresql/"$PG_VER"/bin/pg_config --pkglibdir)" "$(/usr/lib/postgresql/"$PG_VER"/bin/pg_config --sharedir)"/extension /var/run/postgresql/
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
pg_version: ["pg13", "pg14", "pg15"]
pg_version: ["pg13", "pg14", "pg15", "pg16"]
fail-fast: false

env:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- name: Install official version of PostgreSQL and supporting apps/libraries
run: |
echo "----- Remove old postgres -----"
sudo apt remove -y postgres*
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
echo ""

echo "----- Set up PostgreSQL Apt repository -----"
Expand All @@ -120,12 +120,10 @@ jobs:
echo "----- Install system dependencies and PostgreSQL version $PG_VER -----"
sudo apt-get install -y \
build-essential \
clang \
clang-11 \
llvm-14-dev libclang-14-dev clang-14 \
gcc \
libssl-dev \
libz-dev \
llvm-11 \
make \
pkg-config \
postgresql-$PG_VER \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

strategy:
matrix:
pg_version: [pg13, pg14, pg15] # See MATRIX NOTES above
pg_version: [pg13, pg14, pg15, pg16] # See MATRIX NOTES above
fail-fast: false

permissions:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

strategy:
matrix:
pg_version: [pg13, pg14, pg15] # See MATRIX NOTES above
pg_version: [pg13, pg14, pg15, pg16] # See MATRIX NOTES above
fail-fast: false

permissions:
Expand Down
Loading