From 9812efa9ae871520044bfdb7e9197c4c3ae0bc61 Mon Sep 17 00:00:00 2001
From: Adam Hendel <ChuckHend@users.noreply.github.com>
Date: Tue, 15 Oct 2024 19:52:09 -0500
Subject: [PATCH] Patch pgrelease build (#156)

* stoml for arm
---
 .github/workflows/pg-image-build.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pg-image-build.yml b/.github/workflows/pg-image-build.yml
index 764764f..095a942 100644
--- a/.github/workflows/pg-image-build.yml
+++ b/.github/workflows/pg-image-build.yml
@@ -47,7 +47,7 @@ jobs:
         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
+          echo "TAG_VER=$(/usr/local/bin/stoml extension/Cargo.toml package.version)" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -74,7 +74,8 @@ jobs:
                 -f ./images/vectorize-pg/Dockerfile \
                 -t quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-amd64 \
                 -t quay.io/tembo/vectorize-pg:latest-amd64 .
-            docker push quay.io/tembo/vectorize-pg
+            docker push  quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-amd64
+            docker push  quay.io/tembo/vectorize-pg:latest-amd64
 
   build_and_push_arm64:
     name: Build and push ARM64 images
@@ -93,15 +94,15 @@ jobs:
         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
+          wget https://github.com/freshautomations/stoml/releases/download/v0.7.1/stoml_linux_armv7 &> /dev/null
+          mv stoml_linux_armv7 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
+          echo "TAG_VER=$(/usr/local/bin/stoml extension/Cargo.toml package.version)" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -131,7 +132,8 @@ jobs:
                 --platform linux/arm64 \
                 -t quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-arm64 \
                 -t quay.io/tembo/vectorize-pg:latest-arm64 .
-            docker push quay.io/tembo/vectorize-pg
+            docker push quay.io/tembo/vectorize-pg:v${{ steps.versions.outputs.TAG_VER }}-arm64
+            docker push quay.io/tembo/vectorize-pg:latest-arm64
 
   create_manifest:
     name: Create and Push Manifest
@@ -170,7 +172,7 @@ jobs:
         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
+          echo "TAG_VER=$(/usr/local/bin/stoml extension/Cargo.toml package.version)" >> $GITHUB_OUTPUT
 
       - name: Create and push Docker manifest -- Commit
         if: github.event_name != 'release'