diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c023259..b3c0db8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,6 +10,7 @@ on: push: branches: - 14/edge + - 16/edge paths: - snap/** workflow_dispatch: @@ -25,7 +26,7 @@ jobs: - build uses: canonical/data-platform-workflows/.github/workflows/release_snap.yaml@v30.1.3 with: - channel: 14/edge + channel: ${{ github.ref_name }} artifact-prefix: ${{ needs.build.outputs.artifact-prefix }} secrets: snap-store-token: ${{ secrets.SNAP_STORE_TOKEN }} diff --git a/snap/hooks/install b/snap/hooks/install index e8177d6..e99e0aa 100644 --- a/snap/hooks/install +++ b/snap/hooks/install @@ -16,4 +16,4 @@ chown -R 584788:root $SNAP_DATA/* export LOCPATH="${SNAP}"/usr/lib/locale export PGDATA=$SNAP_COMMON/pgsql/data -"${SNAP}/usr/bin/setpriv" --clear-groups --reuid snap_daemon --regid snap_daemon -- "${SNAP}/usr/lib/postgresql/14/bin/initdb" -U postgres -D "${PGDATA}" +"${SNAP}/usr/bin/setpriv" --clear-groups --reuid snap_daemon --regid snap_daemon -- "${SNAP}/usr/lib/postgresql/16/bin/initdb" -U postgres -D "${PGDATA}" diff --git a/snap/local/start-postgresql.sh b/snap/local/start-postgresql.sh index 31e5039..5c128f2 100755 --- a/snap/local/start-postgresql.sh +++ b/snap/local/start-postgresql.sh @@ -4,4 +4,4 @@ export LOCPATH="${SNAP}"/usr/lib/locale export PGDATA=${SNAP_COMMON}/pgsql/data -"${SNAP}/usr/bin/setpriv" --clear-groups --reuid snap_daemon --regid snap_daemon -- "${SNAP}/usr/lib/postgresql/14/bin/postgres" -k /tmp -D "${PGDATA}" +"${SNAP}/usr/bin/setpriv" --clear-groups --reuid snap_daemon --regid snap_daemon -- "${SNAP}/usr/lib/postgresql/16/bin/postgres" -k /tmp -D "${PGDATA}" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5f8ae7b..941044d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,16 +1,14 @@ name: postgresql -base: core22 -version: '14.15' +base: core24 +version: '16.6' summary: PostgreSQL in a snap. description: | PostgreSQL is a free and open-source relational database management system emphasizing extensibility and SQL compliance. -architectures: - - build-on: [amd64] - build-for: [amd64] - - build-on: [arm64] - build-for: [arm64] +platforms: + amd64: + arm64: grade: stable confinement: strict @@ -22,6 +20,8 @@ plugs: private: true layout: + /usr/bin/perl: + symlink: $SNAP/usr/bin/perl /usr/lib/python3/dist-packages: bind: $SNAP/usr/lib/python3/dist-packages /etc/perl: @@ -42,8 +42,8 @@ layout: bind: $SNAP/usr/share/perl /usr/local/lib/site_perl: bind: $SNAP/usr/local/lib/site_perl - /usr/lib/postgresql/14: - bind: $SNAP/usr/lib/postgresql/14 + /usr/lib/postgresql/16: + bind: $SNAP/usr/lib/postgresql/16 /var/cache/postgresql: bind: $SNAP_COMMON/var/cache/postgresql @@ -96,7 +96,7 @@ apps: pg-conftool: command: usr/bin/pg_conftool pg-ctl: - command: usr/lib/postgresql/14/bin/pg_ctl + command: usr/lib/postgresql/16/bin/pg_ctl pg-ctlcluster: command: usr/bin/pg_ctlcluster pg-dumpall: @@ -126,7 +126,7 @@ parts: postgres-debs: plugin: nil stage-packages: - - postgresql=14+238 + - postgresql=16+257build1 - util-linux - locales-all organize: