diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index e28085b1..5e74db53 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -1,4 +1,4 @@ -# How we deploy a release. Covers binary builds. Also manages packaging for winget and choco. +# How we deploy a release. Covers binary builds. Also manages packaging for choco. # # Based on https://github.com/BurntSushi/ripgrep/blob/master/.github/workflows/release.yml @@ -266,18 +266,11 @@ jobs: cargo wix init cargo wix - - name: Build winget - run: | - python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/windows/winget/winget.yaml.template" "Clement.bottom.yaml" "SHA256" "./bottom_x86_64_installer.msi" - $Code = powershell ./deployment/windows/winget/get_product_code.ps1 ./bottom_x86_64_installer.msi - python "./deployment/windows/winget/product_code.py" Clement.bottom.yaml $Code - - name: Create release directory for artifact, move files shell: bash run: | mkdir release mv bottom_x86_64_installer.msi release/ - mv Clement.bottom.yaml release/ - name: Save release as artifact uses: actions/upload-artifact@v2 diff --git a/deployment/windows/winget/get_product_code.ps1 b/deployment/windows/winget/get_product_code.ps1 deleted file mode 100644 index 5ccf74f3..00000000 --- a/deployment/windows/winget/get_product_code.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -# From https://stackoverflow.com/a/31919297 - -$path = $args[0] - -$comObjWI = New-Object -ComObject WindowsInstaller.Installer -$MSIDatabase = $comObjWI.GetType().InvokeMember("OpenDatabase","InvokeMethod",$Null,$comObjWI,@($Path,0)) -$Query = "SELECT Value FROM Property WHERE Property = 'ProductCode'" -$View = $MSIDatabase.GetType().InvokeMember("OpenView","InvokeMethod",$null,$MSIDatabase,($Query)) -$View.GetType().InvokeMember("Execute", "InvokeMethod", $null, $View, $null) -$Record = $View.GetType().InvokeMember("Fetch","InvokeMethod",$null,$View,$null) -$Value = $Record.GetType().InvokeMember("StringData","GetProperty",$null,$Record,1) - -echo $Value \ No newline at end of file diff --git a/deployment/windows/winget/product_code.py b/deployment/windows/winget/product_code.py deleted file mode 100644 index b56f5825..00000000 --- a/deployment/windows/winget/product_code.py +++ /dev/null @@ -1,20 +0,0 @@ -import sys -from string import Template - -args = sys.argv -template_file_path = args[1] -product_code = args[2] - -with open(template_file_path, "r") as template_file: - template = Template(template_file.read()) - - substitutes = dict() - substitutes["product_code"] = "'{}'".format(product_code) - substitute = template.safe_substitute(substitutes) - - print("\n================== Generated package file ==================\n") - print(substitute) - print("\n============================================================\n") - -with open(template_file_path, "w") as template_file: - template_file.write(substitute) diff --git a/deployment/windows/winget/winget.yaml.template b/deployment/windows/winget/winget.yaml.template deleted file mode 100644 index fb85d671..00000000 --- a/deployment/windows/winget/winget.yaml.template +++ /dev/null @@ -1,25 +0,0 @@ -PackageIdentifier: Clement.bottom -PackageVersion: $version -PackageName: bottom -Publisher: Clement Tsang -License: MIT License -LicenseUrl: https://github.com/ClementTsang/bottom/blob/master/LICENSE -Moniker: bottom -Tags: -- tui -- monitoring -- terminal -ShortDescription: Yet another cross-platform graphical process/system monitor. -PackageUrl: https://github.com/ClementTsang/bottom -Commands: -- btm -Installers: -- Architecture: x64 - InstallerUrl: https://github.com/ClementTsang/bottom/releases/download/$version/bottom_x86_64_installer.msi - InstallerSha256: $hash1 - ProductCode: $product_code - InstallerType: msi - Scope: machine -PackageLocale: en-US -ManifestType: singleton -ManifestVersion: 1.0.0