From a99f9eb7878009e22f65bdf9a9c9c15d5795e7ec Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Wed, 20 Sep 2023 17:20:26 +0200
Subject: [PATCH] Fix images

---
 .github/workflows/build-images.yml | 3 ++-
 .github/workflows/ci-images.yml    | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index bb4a784dd6..89b2c7a272 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -34,7 +34,8 @@ jobs:
         id: matrix
         shell: bash
         run: |
-          if [ "${{ inputs.version }}" = "" ]; then
+          echo "Input version: ${{ inputs.version }}"
+          if [ "${{ inputs.version }}" == "" ]; then
             ./mvnw help:evaluate -Dexpression=project.version -q
             echo "VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
           else
diff --git a/.github/workflows/ci-images.yml b/.github/workflows/ci-images.yml
index cf4d0a26b1..27f502b645 100644
--- a/.github/workflows/ci-images.yml
+++ b/.github/workflows/ci-images.yml
@@ -28,11 +28,13 @@ jobs:
       - name: Version from POM
         if: ${{ inputs.version == null || inputs.version == '' }}
         shell: bash
-        run: echo "version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
+        run: echo "VERSIONS=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
       - name: Version from Input
         if: ${{ inputs.version != null && inputs.version != '' }}
         shell: bash
-        run: echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
+        run: echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
+    outputs:
+      version: ${{ env.VERSION }}
   images:
     name: Build and Publish Images
     needs: [ prepare ]