rebuild and rel

tembo-io · Oct 30, 2024 · d39e37d · d39e37d
1 parent 152957a
commit d39e37d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/pg_later_ext.yml b/.github/workflows/pg_later_ext.yml
@@ -15,6 +15,7 @@ on:
   push:
     branches:
       - main
+      - fix-builds
     paths-ignore:
       - "pglater-pg/**"
   release:
@@ -120,21 +121,21 @@ jobs:
         run: |
           set +e
           set -x
-          echo "==== pg16 logs ======"
-          cat ~/.pgrx/16.log
-          echo "==== pg16 conf ======"
-          tail -10 ~/.pgrx/data-16/postgresql.conf
+          echo "==== pg17 logs ======"
+          cat ~/.pgrx/17.log
+          echo "==== pg17 conf ======"
+          tail -10 ~/.pgrx/data-17/postgresql.conf
           echo "==== .pgrx dir ======"
           ls -alh ~/.pgrx
 
   publish:
-    if: github.event_name == 'release'
+    # if: github.event_name == 'release'
     name: trunk publish
     needs: dependencies
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        pg-version: [14, 15, 16, 17]
+        pg-version: [14, 15, 16]
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust stable toolchain
@@ -170,7 +171,7 @@ jobs:
           TRUNK_API_TOKEN: ${{ secrets.TRUNK_AUTH_TOKEN }}
         run: ~/.cargo/bin/trunk publish
   build_and_push:
-    if: github.event_name == 'release'
+    # if: github.event_name == 'release'
     name: Build and push images
     needs:
       - dependencies

diff --git a/images/pglater-pg/Dockerfile b/images/pglater-pg/Dockerfile
@@ -21,22 +21,22 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN $HOME/.cargo/bin/rustup default stable
 
 # install pgrx
-ARG PGRX_VER=0.11.4
+ARG PGRX_VER=0.12.5
 RUN $HOME/.cargo/bin/cargo install cargo-pgrx --version=$PGRX_VER --locked
-RUN $HOME/.cargo/bin/cargo pgrx init --pg16 $(which pg_config)
+RUN $HOME/.cargo/bin/cargo pgrx init --pg17 $(which pg_config)
 
 # install pglater
 RUN $HOME/.cargo/bin/cargo pgrx install --pg-config=$(which pg_config)
 
-FROM postgres:16-bookworm
+FROM postgres:17-bookworm
 
-COPY --from=builder /usr/share/postgresql/16/extension /usr/share/postgresql/16/extension
-COPY --from=builder /usr/lib/postgresql/16/lib /usr/lib/postgresql/16/lib
+COPY --from=builder /usr/share/postgresql/17/extension /usr/share/postgresql/17/extension
+COPY --from=builder /usr/lib/postgresql/17/lib /usr/lib/postgresql/17/lib
 
 RUN apt-get update \
     && apt-get install -y ca-certificates
 
-COPY images/pglater-pg/postgresql.conf /usr/share/postgresql/16/postgresql.conf.sample
+COPY images/pglater-pg/postgresql.conf /usr/share/postgresql/17/postgresql.conf.sample
 
 USER postgres
 CMD ["postgres"]