Skip to content

Commit 2650498

Browse files
authored
bump to v1.2.6 and update pgrx to v0.10.1 (#383)
1 parent 5a8f592 commit 2650498

File tree

10 files changed

+135
-126
lines changed

10 files changed

+135
-126
lines changed

.github/docker/Dockerfile.debian-artifact-build

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
3737
apt-get update -y -qq --fix-missing && \
3838
apt-get install -y --no-install-recommends \
3939
build-essential \
40-
clang \
41-
clang-11 \
40+
llvm-14-dev libclang-14-dev clang-14 \
4241
gcc \
4342
git \
4443
jq \
4544
libssl-dev \
46-
llvm-11 \
4745
make \
4846
postgresql-${PG_VER} \
4947
postgresql-server-dev-${PG_VER} \

.github/workflows/ci.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
strategy:
3131
matrix:
32-
version: ["pg13", "pg14", "pg15", "pg16"]
32+
version: ["pg13", "pg14", "pg15"]
3333
target: ["host", "postgrestd"]
3434
fail-fast: false
3535

@@ -243,7 +243,7 @@ jobs:
243243
echo ""
244244
245245
echo "----- Remove old postgres -----"
246-
sudo apt remove -y postgres*
246+
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
247247
echo ""
248248
249249
echo "----- Set up PostgreSQL Apt repository -----"
@@ -256,18 +256,20 @@ jobs:
256256
echo "----- Install system dependencies and PostgreSQL version $PG_VER -----"
257257
sudo apt-get install -y \
258258
build-essential \
259-
clang \
260-
clang-11 \
259+
llvm-14-dev libclang-14-dev clang-14 \
261260
gcc \
262261
libssl-dev \
263262
libz-dev \
264-
llvm-11 \
265263
make \
266264
pkg-config \
267265
strace \
268266
zlib1g-dev
269267
echo ""
270268
269+
echo "----- Installed Packages -----"
270+
sudo apt list --installed
271+
echo ""
272+
271273
echo "----- Print env -----"
272274
env
273275
echo ""
@@ -277,7 +279,6 @@ jobs:
277279
echo ""
278280
279281
- name: Install release version of PostgreSQL
280-
if: matrix.version != 'pg16'
281282
run: |
282283
echo "----- Set up PostgreSQL Apt repository -----"
283284
sudo apt-get install -y wget gnupg
@@ -289,22 +290,9 @@ jobs:
289290
sudo apt-get install -y \
290291
postgresql-"$PG_VER" \
291292
postgresql-server-dev-"$PG_VER"
292-
293-
- name: Install development version of PostgreSQL
294-
if: matrix.version == 'pg16'
295-
run: |
296-
echo "----- Set up PostgreSQL Apt repository -----"
297-
sudo apt-get install -y wget gnupg
298-
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7FCC7D46ACCC4CF8
299-
sudo add-apt-repository "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -s -c)-pgdg-snapshot main 16"
300-
sudo add-apt-repository "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release -s -c)-pgdg main 16"
301-
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
302-
sudo apt-get update -y -qq --fix-missing
303-
echo ""
304-
305-
sudo apt-get install -y \
306-
postgresql-"$PG_VER" \
307-
postgresql-server-dev-"$PG_VER"
293+
294+
echo "---- pg_config info ----"
295+
/usr/lib/postgresql/"$PG_VER"/bin/pg_config
308296
309297
- name: Set up Postgres permissions
310298
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/

.github/workflows/nightly.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
pg_version: ["pg13", "pg14", "pg15"]
21+
pg_version: ["pg13", "pg14", "pg15", "pg16"]
2222
fail-fast: false
2323

2424
env:
@@ -107,7 +107,7 @@ jobs:
107107
- name: Install official version of PostgreSQL and supporting apps/libraries
108108
run: |
109109
echo "----- Remove old postgres -----"
110-
sudo apt remove -y postgres*
110+
sudo apt remove -y '^postgres.*' '^libpq.*' '^clang.*' '^llvm.*' '^libclang.*' '^libllvm.*' '^mono-llvm.*'
111111
echo ""
112112
113113
echo "----- Set up PostgreSQL Apt repository -----"
@@ -120,12 +120,10 @@ jobs:
120120
echo "----- Install system dependencies and PostgreSQL version $PG_VER -----"
121121
sudo apt-get install -y \
122122
build-essential \
123-
clang \
124-
clang-11 \
123+
llvm-14-dev libclang-14-dev clang-14 \
125124
gcc \
126125
libssl-dev \
127126
libz-dev \
128-
llvm-11 \
129127
make \
130128
pkg-config \
131129
postgresql-$PG_VER \

.github/workflows/release_artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
strategy:
2626
matrix:
27-
pg_version: [pg13, pg14, pg15] # See MATRIX NOTES above
27+
pg_version: [pg13, pg14, pg15, pg16] # See MATRIX NOTES above
2828
fail-fast: false
2929

3030
permissions:
@@ -95,7 +95,7 @@ jobs:
9595

9696
strategy:
9797
matrix:
98-
pg_version: [pg13, pg14, pg15] # See MATRIX NOTES above
98+
pg_version: [pg13, pg14, pg15, pg16] # See MATRIX NOTES above
9999
fail-fast: false
100100

101101
permissions:

0 commit comments

Comments
 (0)