From b0893cc6fcdb0f737468e3d09a2a93877ad1f962 Mon Sep 17 00:00:00 2001
From: Adam Hendel <hendel.adam@gmail.com>
Date: Tue, 15 Oct 2024 14:32:32 -0500
Subject: [PATCH] pgrx 0.12.6

---
 .github/workflows/extension_ci.yml | 72 ------------------------------
 extension/Cargo.toml               |  4 +-
 images/vectorize-pg/Dockerfile     |  2 +-
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/extension_ci.yml b/.github/workflows/extension_ci.yml
index 5423a96..4ba7613 100644
--- a/.github/workflows/extension_ci.yml
+++ b/.github/workflows/extension_ci.yml
@@ -175,75 +175,3 @@ jobs:
         env:
           TRUNK_API_TOKEN: ${{ secrets.TRUNK_AUTH_TOKEN }}
         run: ~/.cargo/bin/trunk publish
-  build_and_push:
-    name: Build and push images
-    env:
-      TARGET_PLATFORMS: linux/amd64,linux/arm64
-    runs-on: debug-large
-      # - self-hosted
-      # - dind
-      # - xlarge-16x16
-    outputs:
-      short_sha: ${{ steps.versions.outputs.SHORT_SHA }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Install stoml and pg-trunk
-        shell: bash
-        run: |
-          set -xe
-          wget https://github.com/freshautomations/stoml/releases/download/v0.7.1/stoml_linux_amd64 &> /dev/null
-          mv stoml_linux_amd64 stoml
-          chmod +x stoml
-          sudo mv stoml /usr/local/bin/
-      - name: Set version strings
-        id: versions
-        run: |
-          echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "TAG_VER=$(/usr/local/bin/stoml Cargo.toml package.version)" >> $GITHUB_OUTPUT
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Quay
-        uses: docker/login-action@v2
-        with:
-          registry: quay.io/tembo
-          username: ${{ secrets.QUAY_USER_TEMBO }}
-          password: ${{ secrets.QUAY_PASSWORD_TEMBO }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push -- Commit
-        if: github.event_name != 'release'
-        uses: docker/build-push-action@v5
-        with:
-          file: ./images/vectorize-pg/Dockerfile
-          context: .
-          platforms: linux/amd64, linux/arm64
-          push: true
-          tags: |
-            quay.io/tembo/vectorize-pg:${{ steps.versions.outputs.SHORT_SHA }}
-
-      - name: Build and push -- Release
-        if: github.event_name == 'release'
-        uses: docker/build-push-action@v5
-        with:
-          file: ./images/vectorize-pg/Dockerfile
-          context: .
-          platforms: linux/amd64, linux/arm64
-          push: true
-          tags: |
-            quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}
-            quay.io/tembo/vectorize-pg:latest
diff --git a/extension/Cargo.toml b/extension/Cargo.toml
index 3a2e328..723535a 100644
--- a/extension/Cargo.toml
+++ b/extension/Cargo.toml
@@ -26,7 +26,7 @@ handlebars = "5.1.0"
 lazy_static = "1.4.0"
 log = "0.4.21"
 pgmq = "0.29"
-pgrx = "=0.12.5"
+pgrx = "=0.12.6"
 postgres-types = "0.2.5"
 regex = "1.9.2"
 reqwest = {version = "0.11.18", features = ["json"] }
@@ -45,7 +45,7 @@ url = "2.4.0"
 vectorize_core = { path = "../core", package = "vectorize-core" }
 
 [dev-dependencies]
-pgrx-tests = "=0.12.5"
+pgrx-tests = "=0.12.6"
 rand = "0.8.5"
 whoami = "1.4.1"
 
diff --git a/images/vectorize-pg/Dockerfile b/images/vectorize-pg/Dockerfile
index 1e1c429..9a2dd98 100644
--- a/images/vectorize-pg/Dockerfile
+++ b/images/vectorize-pg/Dockerfile
@@ -22,7 +22,7 @@ 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.12.5
+ARG PGRX_VER=0.12.6
 RUN $HOME/.cargo/bin/cargo install cargo-pgrx --version=$PGRX_VER --locked
 RUN $HOME/.cargo/bin/cargo pgrx init --pg$PG_MAJ $(which pg_config)