fix

isaacrlevin · Dec 26, 2023 · df9b991 · df9b991
1 parent b5295fe
commit df9b991
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/Choco.yml b/.github/workflows/Choco.yml
@@ -27,20 +27,17 @@ jobs:
           name: SigningScripts
           path: .\SigningScripts
 
-      - name: Get Version from Artifact (Push)
+      - name: Set VERSION Environment Variable (PUSH)
         if: ${{ github.event_name == 'push' }}
         run: |
-          $version = Get-Content .\SigningScripts\version.txt
+          $version = Get-Content ".\SigningScripts\version.txt"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         shell: powershell
 
-      - name: Get Version from Input (Workflow Dispatch)
+      - name: Set VERSION Environment Variable (Workflow Dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
           version = "${{ inputs.Version }}"
-        shell: powershell
-
-      - name: Populate Version Environment Variable
-        run: |
           echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         shell: powershell
 

diff --git a/.github/workflows/Deploy_Desktop.yml b/.github/workflows/Deploy_Desktop.yml
@@ -340,6 +340,7 @@ jobs:
     uses: isaacrlevin/presencelight/.github/workflows/Choco.yml@main
     secrets: inherit
 
+
   Deploy_Store:
     needs: Deploy_Azure_Blob
     if: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/WinGet.yml b/.github/workflows/WinGet.yml
@@ -25,21 +25,19 @@ jobs:
           name: SigningScripts
           path: ./SigningScripts
 
-      - name: Get Version from Artifact (Push)
+      - name: Set VERSION Environment Variable (PUSH)
         if: ${{ github.event_name == 'push' }}
         run: |
-          version=$(<"./SigningScripts/version.txt")
-          echo $version
+          $version = Get-Content "./SigningScripts/version.txt"
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
 
-      - name: Get Version from Input (Workflow Dispatch)
+      - name: Set VERSION Environment Variable (Workflow Dispatch)
         if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
           version = "${{ inputs.Version }}"
-          echo $version
-
-      - name: Populate Version Environment Variable
-        run: |
-          echo "VERSION=$version" >> $GITHUB_ENV
+          echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        shell: pwsh
 
       - name: Create manifest and submit PR
         working-directory: ${{ github.workspace }}/SigningScripts/winget