diff --git a/.github/workflows/Choco.yml b/.github/workflows/Choco.yml index a6b2dd2c..73036996 100644 --- a/.github/workflows/Choco.yml +++ b/.github/workflows/Choco.yml @@ -52,12 +52,12 @@ jobs: - name: Update Chocolatey Files run: | - .\Build\scripts\hash-files.ps1 -Version "${{ env.VERSION }}" + .\SigningScripts\scripts\hash-files.ps1 -Version "${{ env.VERSION }}" shell: powershell - name: Push to Chocolatey run: | - .\Build\scripts\push-choco.ps1 -Version "${{ env.VERSION}}" -CHOCOAPIKEY "${{ secrets.CHOCOAPIKEY}}" + .\SigningScripts\scripts\push-choco.ps1 -Version "${{ env.VERSION}}" -CHOCOAPIKEY "${{ secrets.CHOCOAPIKEY}}" shell: powershell - name: Setup tmate session diff --git a/.github/workflows/WinGet.yml b/.github/workflows/WinGet.yml index 2c61ba5b..fa79a2bf 100644 --- a/.github/workflows/WinGet.yml +++ b/.github/workflows/WinGet.yml @@ -26,13 +26,16 @@ jobs: path: ./SigningScripts - name: Get Version from Artifact (Push) + if: ${{ github.event_name == 'push' }} run: | version=$(<"./SigningScripts/version.txt") + echo $version - name: Get Version from Input (Workflow Dispatch) if: ${{ github.event_name == 'workflow_dispatch' }} run: | version = "${{ inputs.Version }}" + echo $version - name: Populate Version Environment Variable run: | diff --git a/Build/scripts/hash-files.ps1 b/Build/scripts/hash-files.ps1 index bba9b25b..1f9044c2 100644 --- a/Build/scripts/hash-files.ps1 +++ b/Build/scripts/hash-files.ps1 @@ -8,9 +8,11 @@ $GitHubReleaseUrl = "https://github.com/isaacrlevin/presencelight/releases/downl # Hash the Zip Files mkdir .\Download -Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\x86-zip.sha256" -OutFile ".\Download\x86-zip.sha256" -Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\x64-zip.sha256" -OutFile ".\Download\x64-zip.sha256" -Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\win-arm64-zip.sha256" -OutFile ".\Download\win-arm64-zip.sha256" + +#https://github.com/isaacrlevin/presencelight/releases/download/Desktop-v5.6.101/PresenceLight.5.6.101-x86-zip.sha256 +Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\PresenceLight.${Version}-x86-zip.sha256" -OutFile ".\Download\x86-zip.sha256" +Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\PresenceLight.${Version}-x64-zip.sha256" -OutFile ".\Download\x64-zip.sha256" +Invoke-WebRequest -Uri "${GitHubReleaseUrl}v${Version}\PresenceLight.${Version}-win-arm64-zip.sha256" -OutFile ".\Download\win-arm64-zip.sha256" $hash86 = get-content ".\Download\x86-zip.sha256" $hash64 = get-content ".\Download\x64-zip.sha256" $hashARM = get-content ".\Download\win-arm64-zip.sha256"