From e60bf12f8714f4e36da4316a6106d7be62481372 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 2 Jul 2023 19:13:28 -0400 Subject: [PATCH] Do not attempt winget (un)install validation Let's get it right the first time and then let MS do it for us --- .github/workflows/ci-pipeline.yml | 12 ------------ build/package/winget/push_manifest.ps1 | 11 ----------- 2 files changed, 23 deletions(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 1b5adbe419..4d869f8a0f 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -1515,15 +1515,6 @@ jobs: if: "!(cancelled() || failure()) && needs.deploy-tgs.result == 'success'" runs-on: windows-latest steps: - - name: Disable Smart Screen # https://superuser.com/a/1778345 - shell: powershell - run: | - Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows\System" -Name "EnableSmartScreen" -Type DWord -Value 0 - if (!(Test-Path "HKLM:\SOFTWARE\Policies\Microsoft\MicrosoftEdge\PhishingFilter")) { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\MicrosoftEdge\PhishingFilter" -Force | Out-Null - } - Set-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\MicrosoftEdge\PhishingFilter" -Name "EnabledV9" -Type DWord -Value 0 - - name: Setup dotnet uses: actions/setup-dotnet@v2 with: @@ -1537,9 +1528,6 @@ jobs: - name: Install wingetcreate run: winget install wingetcreate --disable-interactivity --accept-source-agreements - - name: Enable LocalManifestFiles - run: winget settings --enable LocalManifestFiles - - name: Checkout uses: actions/checkout@v3 diff --git a/build/package/winget/push_manifest.ps1 b/build/package/winget/push_manifest.ps1 index 879e9d7a6c..ff182010ff 100644 --- a/build/package/winget/push_manifest.ps1 +++ b/build/package/winget/push_manifest.ps1 @@ -27,17 +27,6 @@ try exit $lastexitcode } - # I know these are late, but we actually need the package online to install it - winget install -m . --accept-package-agreements --disable-interactivity - if (-Not $?) { - exit $lastexitcode - } - - winget uninstall tgstation-server --accept-source-agreements --disable-interactivity - if (-Not $?) { - exit $lastexitcode - } - wingetcreate submit -t $Env:WINGET_PUSH_TOKEN . if (-Not $?) { exit $lastexitcode