From 280c66ba6eede727046879a7d70e2f1b48708671 Mon Sep 17 00:00:00 2001
From: Andrew Welker <awelker@pepperdash.com>
Date: Fri, 3 Feb 2023 20:43:05 -0700
Subject: [PATCH] ci: adjust steps output and use version correctly

---
 .github/workflows/docker.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 73b47b1..53aa9da 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,10 +30,10 @@ jobs:
       # Generate the appropriate version number
       - name: Set Version Number
         id: setVersion
-        shell: pwsh
+        shell: powershell
         run: |
           $version = ./.github/scripts/GenerateVersionNumber.ps1
-          echo "version=$version" >> $env:GITHUB_OUTPUT      
+          echo "version=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append      
       - name: Setup MS Build
         uses: microsoft/setup-msbuild@v1.1
       - name: restore Nuget Packages
@@ -44,9 +44,9 @@ jobs:
       - name: Build Solution        
         run: msbuild .\$($Env:SOLUTION_PATH)\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}"
       - name: Create tag for non-rc builds
-        if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
+        if: contains(steps.setVersion.outputs.version, 'alpha') || contains(steps.setVersion.outputs.version, 'beta')
         run: |
-          git tag $($Env:VERSION)
+          git tag ${{ steps.setVersion.outputs.version }}
           git push --tags origin
       # Create the release on the source repo
       - name: Create Release
@@ -54,8 +54,8 @@ jobs:
         if: contains(steps.setVersion.outputs.version,'-rc-') || contains(steps.setVersion.outputs.version,'-hotfix-')
         uses: actions/create-release@v1
         with:
-          tag_name: ${{ env.VERSION  }}
-          release_name: ${{ env.VERSION }}
+          tag_name: ${{ steps.setVersion.outputs.version  }}
+          release_name: ${{ steps.setVersion.outputs.version }}
           prerelease: ${{contains('debug', env.BUILD_TYPE)}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}