From 053725e09a4d5c245725b14be1ae7f1cf8f09891 Mon Sep 17 00:00:00 2001
From: Luke Hagar <lukeslakemail@gmail.com>
Date: Wed, 7 Feb 2024 09:55:26 -0600
Subject: [PATCH] Update build-and-push.yaml

---
 .github/workflows/build-and-push.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 46f0e7b..2f59e18 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-push:
-    name: Build and Push Docker Images
+    name: Build and Push ${{ matrix.release_type }} Docker Images
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -23,20 +23,21 @@ jobs:
           else
             curl -s https://api.github.com/repos/pocketbase/pocketbase/releases | jq -r '.[] | select(.prerelease == true and .draft == false) | .tag_name' | head -n 1 | sed 's/^v//' > latest_version
           fi
-          echo "LATEST_VERSION={latest_version}" >> $GITHUB_ENV
+          echo "LATEST_VERSION=$(cat latest_version)" >> $GITHUB_ENV
         id: latest_version
 
       - name: Print Pocketbase Version
         run: |
           cat latest_version
-          echo "The current pocketbase version is ${{ env.LATEST_VERSION }}"
+          echo "The current ${{ matrix.release_type }} pocketbase version is ${{ env.LATEST_VERSION }}"
         id: print_version
 
       - name: Check latest ${{ matrix.release_type }} Docker Image Version
         run: |
-          echo "default_version" > latest_docker_version
+          echo "LATEST_DOCKER_VERSION=default_version" >> $GITHUB_ENV
           docker pull lukehagar/pocketbase:${{ matrix.release_type }}
           docker inspect lukehagar/pocketbase:${{ matrix.release_type }} --format='{{index .Config.Labels "org.opencontainers.image.version"}}' > latest_docker_version
+          echo "LATEST_DOCKER_VERSION=$(cat latest_docker_version)" >> $GITHUB_ENV
         id: latest_docker_version
         continue-on-error: true
 
@@ -48,7 +49,7 @@ jobs:
       - name: Check if latest version is different
         id: check_version
         run: |
-          if [ "${{env.LATEST_VERSION}}" != "$(cat latest_docker_version)" ]; then
+          if [ "${{env.LATEST_VERSION}}" != "${{env.LATEST_DOCKER_VERSION}}" ]; then
               echo "Versions are different"
               echo "BUILD=true" >> $GITHUB_OUTPUT
           else