v1.8.0 #429

Merged
LukeGus merged 198 commits from dev-1.8.0 into main 2025-11-05 16:36:16 +00:00
6 changed files with 24 additions and 27 deletions
Showing only changes of commit 28b36bdd61 - Show all commits

View File

@@ -607,9 +607,9 @@ jobs:
[System.IO.File]::WriteAllText("$PWD\choco-build\tools\chocolateyinstall.ps1", $installScript, [System.Text.UTF8Encoding]::new($false)) [System.IO.File]::WriteAllText("$PWD\choco-build\tools\chocolateyinstall.ps1", $installScript, [System.Text.UTF8Encoding]::new($false))
# Update nuspec with version (preserve UTF-8 encoding without BOM) # Update nuspec with version (preserve UTF-8 encoding without BOM)
$nuspec = Get-Content "choco-build\termix.nuspec" -Raw -Encoding UTF8 $nuspec = Get-Content "choco-build\termix-ssh.nuspec" -Raw -Encoding UTF8
$nuspec = $nuspec -replace 'VERSION_PLACEHOLDER', $VERSION $nuspec = $nuspec -replace 'VERSION_PLACEHOLDER', $VERSION
[System.IO.File]::WriteAllText("$PWD\choco-build\termix.nuspec", $nuspec, [System.Text.UTF8Encoding]::new($false)) [System.IO.File]::WriteAllText("$PWD\choco-build\termix-ssh.nuspec", $nuspec, [System.Text.UTF8Encoding]::new($false))
echo "Chocolatey package prepared for version $VERSION" echo "Chocolatey package prepared for version $VERSION"
echo "Download URL: $DOWNLOAD_URL" echo "Download URL: $DOWNLOAD_URL"
@@ -617,7 +617,7 @@ jobs:
# Verify the nuspec is valid # Verify the nuspec is valid
echo "" echo ""
echo "Verifying nuspec content:" echo "Verifying nuspec content:"
Get-Content "choco-build\termix.nuspec" -Head 10 Get-Content "choco-build\termix-ssh.nuspec" -Head 10
echo "" echo ""
- name: Install Chocolatey - name: Install Chocolatey
@@ -630,7 +630,7 @@ jobs:
run: | run: |
cd choco-build cd choco-build
echo "Packing Chocolatey package..." echo "Packing Chocolatey package..."
choco pack termix.nuspec choco pack termix-ssh.nuspec
if ($LASTEXITCODE -ne 0) { if ($LASTEXITCODE -ne 0) {
echo "❌ Failed to pack Chocolatey package" echo "❌ Failed to pack Chocolatey package"
@@ -662,11 +662,11 @@ jobs:
choco apikey --key "${{ secrets.CHOCOLATEY_API_KEY }}" --source https://push.chocolatey.org/ choco apikey --key "${{ secrets.CHOCOLATEY_API_KEY }}" --source https://push.chocolatey.org/
try { try {
choco push "termix.$VERSION.nupkg" --source https://push.chocolatey.org/ choco push "termix-ssh.$VERSION.nupkg" --source https://push.chocolatey.org/
if ($LASTEXITCODE -eq 0) { if ($LASTEXITCODE -eq 0) {
echo "" echo ""
echo "✅ Package pushed to Chocolatey successfully!" echo "✅ Package pushed to Chocolatey successfully!"
echo "View at: https://community.chocolatey.org/packages/termix/$VERSION" echo "View at: https://community.chocolatey.org/packages/termix-ssh/$VERSION"
} else { } else {
throw "Chocolatey push failed with exit code $LASTEXITCODE" throw "Chocolatey push failed with exit code $LASTEXITCODE"
} }
@@ -675,15 +675,14 @@ jobs:
echo "❌ Failed to push to Chocolatey" echo "❌ Failed to push to Chocolatey"
echo "" echo ""
echo "Common reasons:" echo "Common reasons:"
echo "1. Package ID 'termix' is already owned by another user" echo "1. Package ID 'termix-ssh' is already owned by another user"
echo "2. You need to register/claim the package ID first" echo "2. You need to register/claim the package ID first"
echo "3. API key doesn't have push permissions" echo "3. API key doesn't have push permissions"
echo "" echo ""
echo "Solutions:" echo "Solutions:"
echo "1. Check if package exists: https://community.chocolatey.org/packages/termix" echo "1. Check if package exists: https://community.chocolatey.org/packages/termix-ssh"
echo "2. If it exists and is yours, contact Chocolatey support to claim it" echo "2. If it exists and is yours, contact Chocolatey support to claim it"
echo "3. If owned by someone else, use a different package ID (e.g., 'termix-ssh')" echo "3. Register a new package ID at: https://community.chocolatey.org/"
echo "4. Register a new package ID at: https://community.chocolatey.org/"
echo "" echo ""
echo "The package artifact has been saved for manual submission." echo "The package artifact has been saved for manual submission."
echo "" echo ""

View File

@@ -29,25 +29,21 @@ Add your Chocolatey API key as a GitHub secret:
- Secret name: `CHOCOLATEY_API_KEY` - Secret name: `CHOCOLATEY_API_KEY`
- Get your API key from: https://community.chocolatey.org/account - Get your API key from: https://community.chocolatey.org/account
**Important:** The package ID "termix" must be registered/owned by you on Chocolatey. If you get a 403 error: **Note:** The package ID is set to "termix-ssh" to avoid conflicts with existing packages.
1. Check if the package exists: https://community.chocolatey.org/packages/termix
2. If taken by someone else, change the package ID in `chocolatey/termix.nuspec` (e.g., to "termix-ssh")
3. See `chocolatey/TROUBLESHOOTING.md` for detailed solutions
### Manual Submission ### Manual Submission
If you prefer to submit manually: If you prefer to submit manually:
1. Download the `chocolatey-package` artifact from GitHub Actions 1. Download the `chocolatey-package` artifact from GitHub Actions
2. Run: `choco push termix.{VERSION}.nupkg --source https://push.chocolatey.org/` 2. Run: `choco push termix-ssh.{VERSION}.nupkg --source https://push.chocolatey.org/`
### Installation (for users) ### Installation (for users)
Once approved on Chocolatey: Once approved on Chocolatey:
```powershell ```powershell
choco install termix choco install termix-ssh
``` ```
--- ---
@@ -335,7 +331,7 @@ For issues with:
```powershell ```powershell
# Chocolatey (after approval) # Chocolatey (after approval)
choco install termix choco install termix-ssh
``` ```
### Linux ### Linux

View File

@@ -102,6 +102,8 @@ Add GitHub secret to enable automatic submission:
- **Get from**: https://community.chocolatey.org/account - **Get from**: https://community.chocolatey.org/account
- **Location**: Repository Settings → Secrets and variables → Actions - **Location**: Repository Settings → Secrets and variables → Actions
**Note:** Package ID is "termix-ssh"
### Flatpak (Manual) ### Flatpak (Manual)
No secrets required. Process: No secrets required. Process:
@@ -218,8 +220,8 @@ These are already configured in `electron-builder.json`.
```powershell ```powershell
cd chocolatey cd chocolatey
choco pack termix.nuspec choco pack termix-ssh.nuspec
choco install termix -s . -y choco install termix-ssh -s . -y
``` ```
### Flatpak ### Flatpak
@@ -244,7 +246,7 @@ Once approved on all platforms:
```bash ```bash
# Windows (Chocolatey) # Windows (Chocolatey)
choco install termix choco install termix-ssh
# Linux (Flatpak) # Linux (Flatpak)
flatpak install flathub com.karmaa.termix flatpak install flathub com.karmaa.termix
@@ -262,7 +264,7 @@ brew install --cask termix
### Chocolatey ### Chocolatey
- Updates pushed automatically when you run workflow with "submit" - Updates pushed automatically when you run workflow with "submit"
- Users update with: `choco upgrade termix` - Users update with: `choco upgrade termix-ssh`
### Flatpak ### Flatpak
@@ -295,7 +297,7 @@ brew install --cask termix
For issues: For issues:
- **Build/Workflow**: https://github.com/Termix-SSH/Termix/issues - **Build/Workflow**: https://github.com/Termix-SSH/Termix/issues
- **Chocolatey**: https://community.chocolatey.org/packages/termix - **Chocolatey**: https://community.chocolatey.org/packages/termix-ssh
- **Flatpak**: https://github.com/flathub/com.karmaa.termix/issues - **Flatpak**: https://github.com/flathub/com.karmaa.termix/issues
- **Homebrew**: https://github.com/Homebrew/homebrew-cask/issues (or your custom tap) - **Homebrew**: https://github.com/Homebrew/homebrew-cask/issues (or your custom tap)

View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata> <metadata>
<id>termix</id> <id>termix-ssh</id>
<version>VERSION_PLACEHOLDER</version> <version>VERSION_PLACEHOLDER</version>
<packageSourceUrl>https://github.com/Termix-SSH/Termix</packageSourceUrl> <packageSourceUrl>https://github.com/Termix-SSH/Termix</packageSourceUrl>
<owners>bugattiguy527</owners> <owners>bugattiguy527</owners>
<title>Termix</title> <title>Termix SSH</title>
<authors>bugattiguy527</authors> <authors>bugattiguy527</authors>
<projectUrl>https://github.com/Termix-SSH/Termix</projectUrl> <projectUrl>https://github.com/Termix-SSH/Termix</projectUrl>
<iconUrl>https://raw.githubusercontent.com/Termix-SSH/Termix/main/public/icon.png</iconUrl> <iconUrl>https://raw.githubusercontent.com/Termix-SSH/Termix/main/public/icon.png</iconUrl>

View File

@@ -1,6 +1,6 @@
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$packageName = 'termix' $packageName = 'termix-ssh'
$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$url64 = 'DOWNLOAD_URL_PLACEHOLDER' $url64 = 'DOWNLOAD_URL_PLACEHOLDER'
$checksum64 = 'CHECKSUM_PLACEHOLDER' $checksum64 = 'CHECKSUM_PLACEHOLDER'

View File

@@ -1,6 +1,6 @@
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$packageName = 'termix' $packageName = 'termix-ssh'
$softwareName = 'Termix*' $softwareName = 'Termix*'
$installerType = 'msi' $installerType = 'msi'