Compare commits
9 Commits
4954e94d08
..
v0.1.3
| Author | SHA1 | Date | |
|---|---|---|---|
| 9bbb3b7449 | |||
| 32e07489ff | |||
| 3cd8c94a94 | |||
| 2aa14642a0 | |||
| 9fcff2694a | |||
| 8e514f29fc | |||
| f00ee0cf3a | |||
| 7d94535d5d | |||
| a808964cf1 |
@@ -1,100 +0,0 @@
|
|||||||
name: Release (Gitea)
|
|
||||||
|
|
||||||
# Lives in .gitea/workflows/ so it runs on Gitea Actions only. The GitHub-side
|
|
||||||
# release lives in .github/workflows/release.yml.
|
|
||||||
#
|
|
||||||
# Triggered automatically on v* tag pushes; can also be invoked manually via
|
|
||||||
# workflow_dispatch with a version override (useful for testing the runner
|
|
||||||
# without bumping the project version).
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
version:
|
|
||||||
description: 'Version to build (e.g. 0.1.4). Defaults to Directory.Build.props.'
|
|
||||||
required: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-installer:
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup .NET
|
|
||||||
uses: actions/setup-dotnet@v4
|
|
||||||
with:
|
|
||||||
dotnet-version: '8.0.x'
|
|
||||||
|
|
||||||
- name: Resolve version
|
|
||||||
id: ver
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
if ('${{ github.event_name }}' -eq 'push') {
|
|
||||||
$v = '${{ github.ref_name }}'.TrimStart('v')
|
|
||||||
} elseif ('${{ inputs.version }}') {
|
|
||||||
$v = '${{ inputs.version }}'
|
|
||||||
} else {
|
|
||||||
[xml]$p = Get-Content Directory.Build.props
|
|
||||||
$v = $p.Project.PropertyGroup.Version
|
|
||||||
}
|
|
||||||
"version=$v" | Out-File $env:GITHUB_OUTPUT -Append
|
|
||||||
Write-Host "Building version $v"
|
|
||||||
|
|
||||||
- name: Restore + test
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
dotnet restore WebhookServer.sln
|
|
||||||
dotnet test WebhookServer.sln -c Release
|
|
||||||
|
|
||||||
- name: Ensure Inno Setup is installed
|
|
||||||
shell: pwsh
|
|
||||||
run: |
|
|
||||||
if (-not (Get-Command iscc -ErrorAction SilentlyContinue) -and `
|
|
||||||
-not (Test-Path 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe') -and `
|
|
||||||
-not (Test-Path 'C:\Program Files\Inno Setup 6\ISCC.exe')) {
|
|
||||||
choco install innosetup --no-progress -y
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Build installer
|
|
||||||
shell: pwsh
|
|
||||||
run: ./scripts/build-installer.ps1 -VersionOverride ${{ steps.ver.outputs.version }}
|
|
||||||
|
|
||||||
# actions/upload-artifact@v4 is GitHub-only ("GHESNotSupportedError" on
|
|
||||||
# Gitea). The release-creation step below attaches the .exe via Gitea's
|
|
||||||
# API directly, which is the only place we actually need to surface it.
|
|
||||||
|
|
||||||
- name: Create Gitea release with installer attached
|
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
|
||||||
shell: pwsh
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: |
|
|
||||||
$version = '${{ steps.ver.outputs.version }}'
|
|
||||||
$tag = '${{ github.ref_name }}'
|
|
||||||
$repo = '${{ github.repository }}'
|
|
||||||
$serverUrl = '${{ github.server_url }}'
|
|
||||||
$apiBase = "$serverUrl/api/v1/repos/$repo"
|
|
||||||
$headers = @{ Authorization = "token $env:GITEA_TOKEN" }
|
|
||||||
|
|
||||||
# 1. Create the release.
|
|
||||||
$isPre = $version.StartsWith('0.')
|
|
||||||
$createBody = @{
|
|
||||||
tag_name = $tag
|
|
||||||
name = "Webhook Server $version"
|
|
||||||
body = "Automated build via Gitea Actions runner."
|
|
||||||
draft = $false
|
|
||||||
prerelease = $isPre
|
|
||||||
} | ConvertTo-Json
|
|
||||||
$rel = Invoke-RestMethod -Uri "$apiBase/releases" -Method Post `
|
|
||||||
-Headers $headers -ContentType 'application/json' -Body $createBody
|
|
||||||
Write-Host "Created release id=$($rel.id) tag=$tag"
|
|
||||||
|
|
||||||
# 2. Attach the installer.
|
|
||||||
$file = Get-Item "dist/WebhookServer-Setup-$version.exe"
|
|
||||||
$uploadUri = "$apiBase/releases/$($rel.id)/assets?name=$($file.Name)"
|
|
||||||
Invoke-RestMethod -Uri $uploadUri -Method Post -Headers $headers `
|
|
||||||
-ContentType 'application/octet-stream' -InFile $file.FullName | Out-Null
|
|
||||||
Write-Host "Uploaded $($file.Name) ($([math]::Round($file.Length / 1MB, 2)) MB) to $tag"
|
|
||||||
@@ -5,7 +5,6 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-installer:
|
build-installer:
|
||||||
# Gitea reads .github/workflows/ for compatibility, but the create-release
|
|
||||||
# step uses a GitHub-only action. Skip the whole job on non-GitHub runners.
|
|
||||||
if: github.server_url == 'https://github.com'
|
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: write # needed to create releases / upload assets
|
contents: write # needed to create releases / upload assets
|
||||||
|
|||||||
@@ -11,10 +11,6 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync:
|
sync:
|
||||||
# Gitea reads .github/workflows/ for compatibility, but this workflow
|
|
||||||
# pushes to a GitHub-hosted wiki. Skip on non-GitHub runners; the Gitea
|
|
||||||
# wiki is synced separately via scripts/sync-wiki.ps1.
|
|
||||||
if: github.server_url == 'https://github.com'
|
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>0.1.4</Version>
|
<Version>0.1.3</Version>
|
||||||
<Authors>Justin Paul</Authors>
|
<Authors>Justin Paul</Authors>
|
||||||
<Company>Justin Paul</Company>
|
<Company>Justin Paul</Company>
|
||||||
<Product>Webhook Server</Product>
|
<Product>Webhook Server</Product>
|
||||||
|
|||||||
+3
-138
@@ -53,150 +53,15 @@ if ($LASTEXITCODE -ne 0) { throw 'service publish failed' }
|
|||||||
-c $Configuration -r win-x64 --self-contained false -o $publishGui | Out-Host
|
-c $Configuration -r win-x64 --self-contained false -o $publishGui | Out-Host
|
||||||
if ($LASTEXITCODE -ne 0) { throw 'GUI publish failed' }
|
if ($LASTEXITCODE -ne 0) { throw 'GUI publish failed' }
|
||||||
|
|
||||||
# 2. Pre-flight: confirm every source path the .iss references exists, and
|
# 2. Compile installer.
|
||||||
# surface the longest path so MAX_PATH issues are obvious in the log.
|
|
||||||
function Show-SourcePath($label, $path, [switch]$Recursive) {
|
|
||||||
if (-not (Test-Path $path)) { Write-Warning "MISSING $label : $path"; return }
|
|
||||||
$items = if ($Recursive) {
|
|
||||||
Get-ChildItem $path -Recurse -File -ErrorAction SilentlyContinue
|
|
||||||
} else {
|
|
||||||
Get-ChildItem $path -File -ErrorAction SilentlyContinue
|
|
||||||
}
|
|
||||||
$count = ($items | Measure-Object).Count
|
|
||||||
$longest = ($items | Measure-Object -Maximum -Property { $_.FullName.Length }).Maximum
|
|
||||||
Write-Host (" {0,-30} files={1,-5} longestPath={2,-5} root={3}" -f $label, $count, $longest, $path)
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "--- pre-flight: source paths the .iss will read ---" -ForegroundColor Cyan
|
|
||||||
Show-SourcePath 'publish\service' $publishSvc -Recursive
|
|
||||||
Show-SourcePath 'publish\gui' $publishGui -Recursive
|
|
||||||
Show-SourcePath 'scripts' (Join-Path $repoRoot 'scripts')
|
|
||||||
Show-SourcePath 'scripts\examples' (Join-Path $repoRoot 'scripts\examples') -Recursive
|
|
||||||
Show-SourcePath 'docs' (Join-Path $repoRoot 'docs') -Recursive
|
|
||||||
Show-SourcePath 'resources' (Join-Path $repoRoot 'resources')
|
|
||||||
Show-SourcePath 'README.md (file)' (Join-Path $repoRoot 'README.md')
|
|
||||||
|
|
||||||
$lpe = (Get-ItemProperty 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' `
|
|
||||||
-Name LongPathsEnabled -ErrorAction SilentlyContinue).LongPathsEnabled
|
|
||||||
Write-Host " LongPathsEnabled (HKLM): $lpe"
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
# 3. Compile installer.
|
|
||||||
$iscc = Find-InnoCompiler
|
$iscc = Find-InnoCompiler
|
||||||
$iss = Join-Path $repoRoot 'installer\webhook-server.iss'
|
$iss = Join-Path $repoRoot 'installer\webhook-server.iss'
|
||||||
$dist = Join-Path $repoRoot 'dist'
|
$dist = Join-Path $repoRoot 'dist'
|
||||||
New-Item -ItemType Directory -Path $dist -Force | Out-Null
|
New-Item -ItemType Directory -Path $dist -Force | Out-Null
|
||||||
|
|
||||||
Write-Host "Compiling installer with $iscc"
|
Write-Host "Compiling installer with $iscc"
|
||||||
# Run ISCC from the .iss directory with just the bare filename. When invoked
|
& $iscc "/DAppVersion=$version" $iss
|
||||||
# with a deeply-nested absolute path on the act-runner host (under
|
if ($LASTEXITCODE -ne 0) { throw 'Inno Setup compile failed' }
|
||||||
# %SystemRoot%\System32\config\systemprofile\...), ISCC sometimes prints a
|
|
||||||
# generic "The system cannot find the path specified." before it touches any
|
|
||||||
# source files. cd-ing first sidesteps it.
|
|
||||||
$issDir = Split-Path $iss -Parent
|
|
||||||
$issName = Split-Path $iss -Leaf
|
|
||||||
|
|
||||||
# Extra pre-flight: confirm the specific files our .iss references that a
|
|
||||||
# trivial test .iss wouldn't (icon, README, scripts) actually exist relative
|
|
||||||
# to the .iss directory the way ISCC will resolve them (RepoRoot = ..\).
|
|
||||||
Write-Host "--- pre-flight: paths the .iss references via {#RepoRoot} ---" -ForegroundColor Cyan
|
|
||||||
$issRefs = @(
|
|
||||||
'resources\webhook-server.ico',
|
|
||||||
'README.md',
|
|
||||||
'scripts\install-service.ps1',
|
|
||||||
'scripts\uninstall-service.ps1',
|
|
||||||
'publish\service',
|
|
||||||
'publish\gui',
|
|
||||||
'docs',
|
|
||||||
'scripts\examples'
|
|
||||||
)
|
|
||||||
foreach ($ref in $issRefs) {
|
|
||||||
$abs = Join-Path $repoRoot $ref
|
|
||||||
$exists = Test-Path $abs
|
|
||||||
Write-Host (" {0,-40} exists={1} ({2})" -f $ref, $exists, $abs)
|
|
||||||
}
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
Write-Host "--- runtime context ---" -ForegroundColor Cyan
|
|
||||||
Write-Host " identity: $([Security.Principal.WindowsIdentity]::GetCurrent().Name)"
|
|
||||||
Write-Host " USERPROFILE: $env:USERPROFILE"
|
|
||||||
Write-Host " APPDATA: $env:APPDATA"
|
|
||||||
Write-Host " LOCALAPPDATA: $env:LOCALAPPDATA"
|
|
||||||
Write-Host " TEMP: $env:TEMP"
|
|
||||||
$isccDir = Split-Path $iscc -Parent
|
|
||||||
Write-Host " ISCC dir: $isccDir"
|
|
||||||
foreach ($f in @('ISCC.exe','ISCmplr.dll','ISPP.dll','Default.isl','Compil32.exe')) {
|
|
||||||
$p = Join-Path $isccDir $f
|
|
||||||
Write-Host (" {0,-15} exists={1}" -f $f, (Test-Path $p))
|
|
||||||
}
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
Write-Host " PS location (pre): $((Get-Location).Path)"
|
|
||||||
Write-Host " .NET cwd (pre): $([System.IO.Directory]::GetCurrentDirectory())"
|
|
||||||
|
|
||||||
Push-Location $issDir
|
|
||||||
$savedDotNetCwd = [System.IO.Directory]::GetCurrentDirectory()
|
|
||||||
[System.IO.Directory]::SetCurrentDirectory($issDir)
|
|
||||||
try {
|
|
||||||
Write-Host " PS location (post): $((Get-Location).Path)"
|
|
||||||
Write-Host " .NET cwd (post): $([System.IO.Directory]::GetCurrentDirectory())"
|
|
||||||
|
|
||||||
# Sanity: compile a minimal .iss right next to ours BEFORE attempting the
|
|
||||||
# real one. Minimal has no #defines, no [Code], no [Files], no compression
|
|
||||||
# tweak - just the absolute floor of what ISCC will accept. If THIS fails
|
|
||||||
# under the same SYSTEM context with the same identical exit/error, the
|
|
||||||
# problem is environmental, not in our .iss content.
|
|
||||||
$minIss = Join-Path $issDir "min-test.iss"
|
|
||||||
@"
|
|
||||||
[Setup]
|
|
||||||
AppName=MinTest
|
|
||||||
AppVersion=1.0
|
|
||||||
AppId={{12345678-1234-1234-1234-123456789ABC}
|
|
||||||
DefaultDirName={pf}\MinTest
|
|
||||||
CreateAppDir=no
|
|
||||||
Uninstallable=no
|
|
||||||
OutputBaseFilename=mintest
|
|
||||||
OutputDir=$dist
|
|
||||||
"@ | Set-Content -Path $minIss -Encoding ascii
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "--- bisect step 1: minimal .iss ---" -ForegroundColor Cyan
|
|
||||||
& $iscc (Split-Path $minIss -Leaf) *>&1 | ForEach-Object { Write-Host " $_" }
|
|
||||||
$minExit = $LASTEXITCODE
|
|
||||||
Write-Host " minimal exit: $minExit"
|
|
||||||
Remove-Item $minIss -ErrorAction SilentlyContinue
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
# Bake the version into a temp .iss and override OutputDir to an absolute
|
|
||||||
# path so nothing in the build depends on cwd resolution.
|
|
||||||
$tempIss = Join-Path $issDir "webhook-server.gen.iss"
|
|
||||||
$issBody = Get-Content $issName -Raw
|
|
||||||
$pattern = '(?s)#ifndef AppVersion\s+#define AppVersion "[^"]*"\s+#endif'
|
|
||||||
if ($issBody -notmatch $pattern) { throw "Could not find #ifndef AppVersion block in $issName" }
|
|
||||||
$issBody = $issBody -replace $pattern, "#define AppVersion `"$version`""
|
|
||||||
Set-Content -Path $tempIss -Value $issBody -Encoding ascii
|
|
||||||
Write-Host " using $tempIss"
|
|
||||||
|
|
||||||
# Capture stdout+stderr together so any error line ISCC emits is visible
|
|
||||||
# in the runner log even if the runner's console capture drops one stream.
|
|
||||||
# /O<absolute> overrides OutputDir so ..\dist isn't resolved relative to
|
|
||||||
# whatever cwd ISCC actually inherits.
|
|
||||||
$logPath = Join-Path $env:TEMP "iscc-$version.log"
|
|
||||||
& $iscc "/O$dist" (Split-Path $tempIss -Leaf) *>&1 | Tee-Object -FilePath $logPath | ForEach-Object { Write-Host $_ }
|
|
||||||
$exit = $LASTEXITCODE
|
|
||||||
Write-Host " ISCC exit code: $exit"
|
|
||||||
Write-Host " ISCC log path: $logPath"
|
|
||||||
if (Test-Path $logPath) {
|
|
||||||
Write-Host " --- iscc log file contents ---"
|
|
||||||
Get-Content $logPath | ForEach-Object { Write-Host " $_" }
|
|
||||||
Write-Host " --- end iscc log ---"
|
|
||||||
}
|
|
||||||
Remove-Item $tempIss -ErrorAction SilentlyContinue
|
|
||||||
} finally {
|
|
||||||
[System.IO.Directory]::SetCurrentDirectory($savedDotNetCwd)
|
|
||||||
Pop-Location
|
|
||||||
}
|
|
||||||
if ($exit -ne 0) { throw "Inno Setup compile failed (exit $exit)" }
|
|
||||||
|
|
||||||
$out = Get-Item (Join-Path $dist "WebhookServer-Setup-$version.exe")
|
$out = Get-Item (Join-Path $dist "WebhookServer-Setup-$version.exe")
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|||||||
@@ -82,14 +82,8 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
|||||||
{
|
{
|
||||||
if (Selected is null) return;
|
if (Selected is null) return;
|
||||||
|
|
||||||
// Capture before the refresh; the ObservableCollection.Clear() in
|
|
||||||
// RefreshAsync nulls Selected (the original instance is gone from the
|
|
||||||
// collection so the SelectedItem binding clears).
|
|
||||||
var fileName = Selected.FileName;
|
|
||||||
var savedAt = Selected.SavedAt;
|
|
||||||
|
|
||||||
var ok = MessageBox.Show(
|
var ok = MessageBox.Show(
|
||||||
$"Roll the configuration back to the checkpoint from {savedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
$"Roll the configuration back to the checkpoint from {Selected.SavedAt.ToLocalTime():yyyy-MM-dd HH:mm:ss}?\n\nThe current configuration is automatically saved as a new checkpoint first, so you can roll forward again.",
|
||||||
"Confirm rollback",
|
"Confirm rollback",
|
||||||
MessageBoxButton.OKCancel,
|
MessageBoxButton.OKCancel,
|
||||||
MessageBoxImage.Warning);
|
MessageBoxImage.Warning);
|
||||||
@@ -97,10 +91,10 @@ public sealed partial class ConfigCheckpointsViewModel : ObservableObject
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await _client.RestoreBackupAsync(fileName).ConfigureAwait(false);
|
await _client.RestoreBackupAsync(Selected.FileName).ConfigureAwait(false);
|
||||||
await RefreshAsync().ConfigureAwait(false);
|
await RefreshAsync().ConfigureAwait(false);
|
||||||
Application.Current.Dispatcher.Invoke(() =>
|
Application.Current.Dispatcher.Invoke(() =>
|
||||||
StatusMessage = $"Rolled back to {fileName}.");
|
StatusMessage = $"Rolled back to {Selected!.FileName}.");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user