From ba71ff3db9ac39a0ebd5c131c73bc3530ddb386b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Sun, 3 Apr 2022 17:43:21 +0100
Subject: [PATCH] Update package-publish.yml

---
 .github/workflows/package-publish.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/package-publish.yml b/.github/workflows/package-publish.yml
index de4dc8e..dadbafa 100644
--- a/.github/workflows/package-publish.yml
+++ b/.github/workflows/package-publish.yml
@@ -5,8 +5,8 @@ on:
     types: [published]
 
 env:
-   PACKAGE_NAME: .+win-x64.+\.msi
-   PACKAGE_ID: PTRTECH.UVtools
+   WINGET_PACKAGE_NAME: .+win-x64.+\.msi
+   WINGET_PACKAGE_ID: PTRTECH.UVtools
    WINGET_TOKEN: ${{ secrets.WINGET_TOKEN }}
    NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
    
@@ -21,7 +21,8 @@ jobs:
         run: iwr -Uri https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
       - name: Set VERSION variable from tag
         run: | 
-          $version = $github.event.release.tag_name.Replace('v', '')
+          $github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json
+          $version = $github.release.tag_name.Replace('v', '')
           if($version.Length -lt 5)
           { 
              Write-Error "Version $version is too short!"
@@ -31,16 +32,17 @@ jobs:
           "VERSION=${version}" >> $env:GITHUB_ENV
       - name: Set INSTALLER_URL variable from release asset
         run: | 
-          $installerUrl = $github.event.release.assets | Where-Object -Property name -match "${PACKAGE_NAME}" | Select -ExpandProperty browser_download_url -First 1
+          $github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json
+          $installerUrl = $github.release.assets | Where-Object -Property name -match "${env:WINGET_PACKAGE_NAME}" | Select -ExpandProperty browser_download_url -First 1
           if($null -eq $installerUrl)
           { 
-             Write-Error "Installer URL not found on ${github.event.release.assets}"
+             Write-Error "Installer URL not found on ${github.release.assets}"
              exit -1 
           }
           Write-Output "Installer url: ${installerUrl}"
           "INSTALLER_URL=${installerUrl}" >> $env:GITHUB_ENV
       - name: Submit package to Windows Package Manager Community Repository
-        run: .\wingetcreate.exe update ${PACKAGE_ID} --version ${VERSION} --urls ${INSTALLER_URL} --token ${WINGET_TOKEN} --submit
+        run: .\wingetcreate.exe update ${env:WINGET_PACKAGE_ID} --version ${env:VERSION} --urls ${env:INSTALLER_URL} --token ${env:WINGET_TOKEN} --submit
         
   nuget:
     name: Nuget - Publish package