Skip to content

Commit d250950

Browse files
committed
Merge remote-tracking branch 'origin/develop' into pcnc/consolidate-release-15.6
2 parents 06e4cf5 + 826897a commit d250950

22 files changed

+6711
-376
lines changed

.github/workflows/ami-release-nix.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ jobs:
130130
SLACK_MESSAGE: 'Building Postgres AMI failed'
131131
SLACK_FOOTER: ''
132132

133+
- name: Cleanup resources on build cancellation
134+
if: ${{ always() }}
135+
run: |
136+
aws ec2 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -n 1 -I {} aws ec2 terminate-instances --instance-ids {}
137+
133138
- name: Cleanup resources on build cancellation
134139
if: ${{ cancelled() }}
135140
run: |

.github/workflows/ami-release.yml

Lines changed: 0 additions & 158 deletions
This file was deleted.

.github/workflows/publish-pgupgrade-scripts.yml

Lines changed: 0 additions & 100 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
POSTGRES_PASSWORD: password
2424
steps:
2525
- uses: actions/checkout@v3
26+
- id: settings
27+
# Remove spaces and quotes to get the raw version string
28+
run: sed -r 's/(\s|\")+//g' common-nix.vars.pkr.hcl >> $GITHUB_OUTPUT
29+
2630
- id: args
2731
uses: mikefarah/yq@master
2832
with:
@@ -36,23 +40,23 @@ jobs:
3640
with:
3741
load: true
3842
context: .
43+
file: "Dockerfile-156"
3944
target: production
4045
build-args: |
4146
${{ steps.args.outputs.result }}
42-
tags: supabase/postgres:latest
47+
tags: supabase/postgres:${{ steps.settings.outputs.postgres-version }}
4348
cache-from: |
44-
type=gha,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
45-
type=gha,scope=${{ github.base_ref }}-latest-${{ matrix.arch }}
46-
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-latest-${{ matrix.arch }}
49+
type=gha,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
50+
type=gha,scope=${{ github.base_ref }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
51+
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-${{ steps.settings.outputs.postgres-version }}-${{ matrix.arch }}
4752

4853
- name: Start Postgres
4954
run: |
5055
docker run --rm --pull=never \
5156
-e POSTGRES_PASSWORD=${{ env.POSTGRES_PASSWORD }} \
5257
-p ${{ env.POSTGRES_PORT }}:5432 \
5358
--name supabase_postgres \
54-
-d supabase/postgres:latest
55-
59+
-d supabase/postgres:${{ steps.settings.outputs.postgres-version }}
5660
- name: Install psql
5761
run: |
5862
sudo apt update

.github/workflows/testinfra.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

ansible/files/postgresql_config/postgresql.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ default_text_search_config = 'pg_catalog.english'
688688
#local_preload_libraries = ''
689689
#session_preload_libraries = ''
690690

691-
shared_preload_libraries = 'pg_stat_statements, pg_stat_monitor, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter' # (change requires restart)
691+
shared_preload_libraries = 'pg_stat_statements, pg_stat_monitor, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace' # (change requires restart)
692692
jit_provider = 'llvmjit' # JIT library to use
693693

694694
# - Other Defaults -

ansible/tasks/internal/optimizations.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- motd-news
1111
- vector
1212
- lvm2-monitor
13+
- salt-minion
1314
when: debpkg_mode
1415

1516
- name: ensure services are stopped and disabled for first boot nix build
@@ -23,6 +24,7 @@
2324
- fail2ban
2425
- motd-news
2526
- vector
27+
- salt-minion
2628
when: stage2_nix
2729

2830
- name: disable man-db

ansible/vars.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,13 @@ hypopg_release_checksum: sha256:9afe6357fd389d8d33fad81703038ce520b09275ec00153c
141141
pg_repack_release: "1.5.0"
142142
pg_repack_release_checksum: sha256:9a14d6a95bfa29f856aa10538238622c1f351d38eb350b196c06720a878ccc52
143143

144-
pgvector_release: "0.7.0"
145-
pgvector_release_checksum: sha256:1b5503a35c265408b6eb282621c5e1e75f7801afc04eecb950796cfee2e3d1d8
144+
pgvector_release: "0.7.4"
145+
pgvector_release_checksum: sha256:0341edf89b1924ae0d552f617e14fb7f8867c0194ed775bcc44fa40288642583
146146

147147
pg_tle_release: "1.3.2"
148148
pg_tle_release_checksum: sha256:d04f72d88b21b954656609743560684ac42645b64a36c800d4d2f84d1f180de1
149149

150150
index_advisor_release: "0.2.0"
151151
index_advisor_checksum: sha256:2d3642012a9185cda51f1e82ba43d64a81b24a2655a3ac3afdcbbd95d46a1a27
152+
153+
pg_backtrace_release: "1.1"

common.vars.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
postgres-version = "15.1.1.86"
1+
postgres-version = "15.1.1.90"

0 commit comments

Comments
 (0)